[FFmpeg-cvslog] mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2

Diego Biurrun git at videolan.org
Sun Nov 17 20:06:26 CET 2013


ffmpeg | branch: release/2.1 | Diego Biurrun <diego at biurrun.de> | Wed Nov 13 18:44:25 2013 +0100| [425517eecbb0dd708434d409ed43b5b078719bfd] | committer: Michael Niedermayer

mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 321514042534a2501a9f6223b88f0d2b8060f858)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=425517eecbb0dd708434d409ed43b5b078719bfd
---

 libavcodec/mpeg12dec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 82b503d..31a9861 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2070,7 +2070,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
     if (s->codec_tag == AV_RL32("BW10")) {
         s->codec_id              = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
     } else {
-        exchange_uv(s); // common init reset pblocks, so we swap them here
         s->swap_uv = 1; // in case of xvmc we need to swap uv for each MB
         s->codec_id              = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
     }



More information about the ffmpeg-cvslog mailing list