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/h264_parser.c | |
| parent | 7834bb092a9583988bb833f2320752fe24b7e5e2 (diff) | |
| parent | f1e9398621af0bc9d166014e4ce6996bb4f141d0 (diff) | |
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/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 44b92b79e3..3b5b652bcb 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -30,6 +30,7 @@ #include "parser.h" #include "h264data.h" #include "golomb.h" +#include "internal.h" static int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size) @@ -176,7 +177,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, } src_length = nalsize; } else { - buf = avpriv_mpv_find_start_code(buf, buf_end, &state); + buf = avpriv_find_start_code(buf, buf_end, &state); if(buf >= buf_end) break; --buf; |