wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'f1e9398621'

Browse source 
* commit 'f1e9398621':
  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>
This commit is contained in:
Michael Niedermayer 2013-03-26 13:32:12 +01:00
commit b19604cc4b
9 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libavcodec/mpegvideo_parser.c
View file

@ -22,6 +22,7 @@
#include "parser.h"
#include "mpegvideo.h"
#include "internal.h"
struct MpvParseContext {
ParseContext pc;
@ -50,7 +51,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
while (buf < buf_end) {
start_code= -1;
buf= avpriv_mpv_find_start_code(buf, buf_end, &start_code);
buf= avpriv_find_start_code(buf, buf_end, &start_code);
bytes_left = buf_end - buf;
switch(start_code) {
case PICTURE_START_CODE: