OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc89c29
)
mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2
author
Diego Biurrun
<diego@biurrun.de>
Wed, 13 Nov 2013 17:44:25 +0000
(18:44 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 17 Nov 2013 18:11:07 +0000
(19:11 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
321514042534a2501a9f6223b88f0d2b8060f858
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12dec.c
b/libavcodec/mpeg12dec.c
index
82b503d
..
31a9861
100644
(file)
--- 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;
}