avcodec/h264dec: Move find_start_code() to its only user

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/5.1
Andreas Rheinhardt 3 years ago
parent 6c8e841824
commit b531b58b2c
  1. 9
      libavcodec/h264_parser.c
  2. 11
      libavcodec/h264dec.h

@ -64,6 +64,15 @@ typedef struct H264ParseContext {
int last_frame_num, last_picture_structure; int last_frame_num, last_picture_structure;
} H264ParseContext; } H264ParseContext;
static int find_start_code(const uint8_t *buf, int buf_size,
int buf_index, int next_avc)
{
uint32_t state = -1;
buf_index = avpriv_find_start_code(buf + buf_index, buf + next_avc + 1, &state) - buf - 1;
return FFMIN(buf_index, buf_size);
}
static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf,
int buf_size, void *logctx) int buf_size, void *logctx)

@ -44,7 +44,6 @@
#include "h264pred.h" #include "h264pred.h"
#include "h264qpel.h" #include "h264qpel.h"
#include "h274.h" #include "h274.h"
#include "internal.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "parser.h" #include "parser.h"
#include "qpeldsp.h" #include "qpeldsp.h"
@ -833,16 +832,6 @@ static av_always_inline int get_dct8x8_allowed(const H264Context *h, H264SliceCo
0x0001000100010001ULL)); 0x0001000100010001ULL));
} }
static inline int find_start_code(const uint8_t *buf, int buf_size,
int buf_index, int next_avc)
{
uint32_t state = -1;
buf_index = avpriv_find_start_code(buf + buf_index, buf + next_avc + 1, &state) - buf - 1;
return FFMIN(buf_index, buf_size);
}
int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup); int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup);
int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src); int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src);

Loading…
Cancel
Save