aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-11-13 18:44:25 +0100
committerDiego Biurrun <diego@biurrun.de>2013-11-14 14:21:27 +0100
commitad1161799e096c4bae885f100f27f886755d479a (patch)
tree915979db483a22c396576370be45ee5f0039f87a
parent669fe505952f3d8175b1ad6971033a8e8120523b (diff)
downloadffmpeg-ad1161799e096c4bae885f100f27f886755d479a.tar.gz
mpeg12dec: Remove outdated UV swapping code for VCR2
-rw-r--r--libavcodec/mpeg12dec.c18
-rw-r--r--libavcodec/mpegvideo.h1
2 files changed, 0 insertions, 19 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 35e23458da..0e11dda3e6 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -646,15 +646,6 @@ static inline int get_qscale(MpegEncContext *s)
}
}
-static void exchange_uv(MpegEncContext *s)
-{
- int16_t (*tmp)[64];
-
- tmp = s->pblocks[4];
- s->pblocks[4] = s->pblocks[5];
- s->pblocks[5] = tmp;
-}
-
/* motion type (for MPEG-2) */
#define MT_FIELD 1
#define MT_FRAME 2
@@ -761,9 +752,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
// if 1, we memcpy blocks in xvmcvideo
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks
- if (s->swap_uv) {
- exchange_uv(s);
- }
}
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
@@ -978,9 +966,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
//if 1, we memcpy blocks in xvmcvideo
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
ff_xvmc_pack_pblocks(s, cbp);
- if (s->swap_uv) {
- exchange_uv(s);
- }
}
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
@@ -1988,7 +1973,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
s->chroma_format = 1;
s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
s->out_format = FMT_MPEG1;
- s->swap_uv = 0; // AFAIK VCR2 does not have SEQ_HEADER
if (s->flags & CODEC_FLAG_LOW_DELAY)
s->low_delay = 1;
@@ -2028,8 +2012,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
if (ff_MPV_common_init(s) < 0)
return -1;
- 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
s1->mpeg_enc_ctx_allocated = 1;
for (i = 0; i < 64; i++) {
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 50a87597a1..79da9fbec4 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -707,7 +707,6 @@ typedef struct MpegEncContext {
int rtp_mode;
uint8_t *ptr_lastgob;
- int swap_uv; //vcr2 codec is an MPEG-2 variant with U and V swapped
int16_t (*pblocks[12])[64];
int16_t (*block)[64]; ///< points to one of the following blocks