diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-24 19:35:13 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-26 15:23:08 +0100 |
| commit | b531b58b2c9f684ad9408f878453e10908ca94de (patch) | |
| tree | 3f4b34bb11407df2ced5e83dbc6495b3ab580d81 | |
| parent | 6c8e8418241551397bbb671b81430c8774d92a51 (diff) | |
| download | ffmpeg-b531b58b2c9f684ad9408f878453e10908ca94de.tar.gz | |
avcodec/h264dec: Move find_start_code() to its only user
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/h264_parser.c | 9 | ||||
| -rw-r--r-- | libavcodec/h264dec.h | 11 |
2 files changed, 9 insertions, 11 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index cfbf6f4486..881cab7536 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -64,6 +64,15 @@ typedef struct H264ParseContext { int last_frame_num, last_picture_structure; } 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, int buf_size, void *logctx) diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 87c4e4e539..1128dddfd1 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -44,7 +44,6 @@ #include "h264pred.h" #include "h264qpel.h" #include "h274.h" -#include "internal.h" #include "mpegutils.h" #include "parser.h" #include "qpeldsp.h" @@ -833,16 +832,6 @@ static av_always_inline int get_dct8x8_allowed(const H264Context *h, H264SliceCo 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_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src); |