[SCM] libav/experimental: Simplify: Remove impossible condition.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:18:51 UTC 2013
The following commit has been merged in the experimental branch:
commit fe655f6723ff091c9a536f537ec35da9e7177bcd
Author: Nicolas Kaiser <nikai at nikai.net>
Date: Tue Nov 9 23:58:41 2010 +0000
Simplify: Remove impossible condition.
Patch by Nicolas Kaiser, nikai nikai net
Originally committed as revision 25714 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index a245200..0a5a750 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@@ -301,7 +301,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
for (i = 0; i < blocks_per_mb; i++) {
if (s->block_last_index[i] >= 0) {
// I do not have unsigned_intra MOCO to test, hope it is OK.
- if (s->mb_intra && (render->idct || (!render->idct && !render->unsigned_intra)))
+ if (s->mb_intra && (render->idct || !render->unsigned_intra))
*s->pblocks[i][0] -= 1 << 10;
if (!render->idct) {
s->dsp.idct(*s->pblocks[i]);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list