diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:45:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:46:51 +0100 |
| commit | cf948200bd7083fb214bf7e1bd9ce3c82edd3303 (patch) | |
| tree | db6dca355dee94aace3fc88106314260ec88534d /libavcodec/mpeg4video_parser.c | |
| parent | 36e2ec40688d0c3c350d31fae00a54f6a23b7647 (diff) | |
| parent | ff7ffe48097f32417781fe8b2b417eff05a52c55 (diff) | |
| download | ffmpeg-cf948200bd7083fb214bf7e1bd9ce3c82edd3303.tar.gz | |
Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'
* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55':
mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
| -rw-r--r-- | libavcodec/mpeg4video_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index b451517565..96ed519571 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -120,7 +120,7 @@ static av_cold int mpeg4video_parse_init(AVCodecParserContext *s) pc->first_picture = 1; pc->dec_ctx.m.quant_precision = 5; pc->dec_ctx.m.slice_context_count = 1; - pc->dec_ctx.m.showed_packed_warning = 1; + pc->dec_ctx.showed_packed_warning = 1; return 0; } |