diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 13:32:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 13:44:09 +0100 |
| commit | b19604cc4bbff8a533efdd6cb3b79327d666d29a (patch) | |
| tree | e90c48d05e9e19d1706bf0003d95190932a9783f /libavcodec/cavsdec.c | |
| parent | 7834bb092a9583988bb833f2320752fe24b7e5e2 (diff) | |
| parent | f1e9398621af0bc9d166014e4ce6996bb4f141d0 (diff) | |
| download | ffmpeg-b19604cc4bbff8a533efdd6cb3b79327d666d29a.tar.gz | |
Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'
* commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0':
lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo
Conflicts:
libavcodec/h264_parser.c
libavcodec/internal.h
libavcodec/mpeg12.c
libavcodec/utils.c
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
| -rw-r--r-- | libavcodec/cavsdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 2ef3eb3c3a..ec4a819eab 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1159,7 +1159,7 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf_ptr = buf; buf_end = buf + buf_size; for(;;) { - buf_ptr = avpriv_mpv_find_start_code(buf_ptr, buf_end, &stc); + buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &stc); if ((stc & 0xFFFFFE00) || buf_ptr == buf_end) return FFMAX(0, buf_ptr - buf); input_size = (buf_end - buf_ptr) * 8; |