diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 03:20:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 03:20:29 +0200 |
| commit | 61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac (patch) | |
| tree | 6000ca917b87276d4e29b6ff5ca4fb7d0fee5b30 /libavcodec/mpeg4videodec.c | |
| parent | d57ca5e5a8ba993630c87fbc87ed1f8267309278 (diff) | |
| parent | 581281e242609a222233a2e5538b89dfb88fb18e (diff) | |
| download | ffmpeg-streaming-61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac.zip ffmpeg-streaming-61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac.tar.gz | |
Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'
* commit '581281e242609a222233a2e5538b89dfb88fb18e':
matroskadec: check realloc in lzo encoding
matroska: honor error_recognition on unknown doctypes
tiffdec: Add support for GRAY16LE.
tiffenc: Add support for little endian RGB48 and GRAY16
mpeg4: support frame parameter changes with frame-mt
mpegvideo: check ff_find_unused_picture() return value for errors
mpegvideo: release frame buffers before freeing them
configure: msvc: default to 'lib' as 'ar' tool
build: support some non-standard ar variants
Conflicts:
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/tiff.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 139f6d8..a5dc36e 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1630,6 +1630,9 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){ height = get_bits(gb, 13); skip_bits1(gb); /* marker */ if(width && height && !(s->width && s->codec_tag == AV_RL32("MP4S"))){ /* they should be non zero but who knows ... */ + if (s->width && s->height && + (s->width != width || s->height != height)) + s->context_reinit = 1; s->width = width; s->height = height; } |
