summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-01-24 22:47:50 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-01-24 22:47:50 +0000
commitb52fcba9cd82571ea404b3848bc796934bd3cf69 (patch)
treeb305bf0c68f6cb40d88345cab184f086be3f0f86 /libavcodec/mpeg12.c
parentb0634fd11e674ea18d989071adeddeea0e5aca86 (diff)
Fix decoding ATI VCR2 codec, sample in
samples/V-codecs/ATI-VCR12/ATI/VCR2test.avi Software decoding was broken since r8865, when two new context variables were added, but not initialized in vcr2_init_sequence(). Another such context variable was added in r18381. Originally committed as revision 21438 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r--libavcodec/mpeg12.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 636ae067c8..7eddabcaca 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2092,6 +2092,9 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
s->chroma_format = 1;
s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
avctx->sub_id = 2; /* indicates MPEG-2 */
+ s1->save_width = s->width;
+ s1->save_height = s->height;
+ s1->save_progressive_seq = s->progressive_sequence;
return 0;
}