generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'

Browse Source 
* commit '35e0833d410e31d9fd35695ad798c5d13de2af58':
  mpeg4videodec: add a mpeg4-specific private context.

Conflicts:
	libavcodec/mpeg4video_parser.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-29 22:27:28 +01:00
parent f924d6e40b 35e0833d41
commit be0b869b04
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpeg4video_parser.c
View File

@@ -30,7 +30,7 @@
struct Mp4vParseContext {
ParseContext pc;
struct MpegEncContext enc;
Mpeg4DecContext dec_ctx;
int first_picture;
};
@@ -78,7 +78,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
const uint8_t *buf, int buf_size)
{
struct Mp4vParseContext *pc = s1->priv_data;
MpegEncContext *s = &pc->enc;
Mpeg4DecContext *dec_ctx = &pc->dec_ctx;
MpegEncContext *s = &dec_ctx->m;
GetBitContext gb1, *gb = &gb1;
int ret;
@@ -117,9 +118,9 @@ static av_cold int mpeg4video_parse_init(AVCodecParserContext *s)
ff_mpeg4videodec_static_init();
pc->first_picture = 1;
pc->enc.quant_precision = 5;
pc->enc.slice_context_count = 1;
pc->enc.showed_packed_warning = 1;
pc->dec_ctx.m.quant_precision = 5;
pc->dec_ctx.m.slice_context_count = 1;
pc->dec_ctx.m.showed_packed_warning = 1;
return 0;
}