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/utils.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/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3f17bf5724..d547ba1b14 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -41,7 +41,6 @@ #include "avcodec.h" #include "dsputil.h" #include "libavutil/opt.h" -#include "mpegvideo.h" #include "thread.h" #include "frame_thread_encoder.h" #include "internal.h" @@ -3100,9 +3099,9 @@ int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf) return 0; } -const uint8_t *avpriv_mpv_find_start_code(const uint8_t *av_restrict p, - const uint8_t *end, - uint32_t *av_restrict state) +const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, + const uint8_t *end, + uint32_t *av_restrict state) { int i; |