diff options
| author | Martin Storsjö <martin@martin.st> | 2013-03-25 14:11:41 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-03-26 09:50:02 +0200 |
| commit | f1e9398621af0bc9d166014e4ce6996bb4f141d0 (patch) | |
| tree | f4a7c9b8055d6fa5852bbbc53bba9444f137e36c /libavcodec/mpeg12.c | |
| parent | 75644335b907919057960716508477239c26fed4 (diff) | |
| download | ffmpeg-f1e9398621af0bc9d166014e4ce6996bb4f141d0.tar.gz | |
lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo
Also move the declaration to internal.h, and add restrict qualifiers
to the declaration (as in the implementation).
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index bd018d377f..6008f9c5a0 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1709,7 +1709,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, if (avctx->hwaccel) { const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */ int start_code = -1; - buf_end = avpriv_mpv_find_start_code(buf_start + 2, *buf + buf_size, &start_code); + buf_end = avpriv_find_start_code(buf_start + 2, *buf + buf_size, &start_code); if (buf_end < *buf + buf_size) buf_end -= 4; s->mb_y = mb_y; @@ -1901,7 +1901,7 @@ static int slice_decode_thread(AVCodecContext *c, void *arg) return 0; start_code = -1; - buf = avpriv_mpv_find_start_code(buf, s->gb.buffer_end, &start_code); + buf = avpriv_find_start_code(buf, s->gb.buffer_end, &start_code); mb_y= (start_code - SLICE_MIN_START_CODE) << field_pic; if (s->picture_structure == PICT_BOTTOM_FIELD) mb_y++; @@ -2185,7 +2185,7 @@ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, } state++; } else { - i = avpriv_mpv_find_start_code(buf + i, buf + buf_size, &state) - buf - 1; + i = avpriv_find_start_code(buf + i, buf + buf_size, &state) - buf - 1; if (pc->frame_start_found == 0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE) { i++; pc->frame_start_found = 4; @@ -2229,7 +2229,7 @@ static int decode_chunks(AVCodecContext *avctx, for (;;) { /* find next start code */ uint32_t start_code = -1; - buf_ptr = avpriv_mpv_find_start_code(buf_ptr, buf_end, &start_code); + buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &start_code); if (start_code > 0x1ff) { if (s2->pict_type != AV_PICTURE_TYPE_B || avctx->skip_frame <= AVDISCARD_DEFAULT) { if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE)) { |