aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2009-02-05 07:59:11 +0000
committerPeter Ross <pross@xvid.org>2009-02-05 07:59:11 +0000
commit44ba8b650fdde839d186cfc3634060c0b0dd47d1 (patch)
tree3de03a8863d9178af9bb0ba864be5742b4dc39bf /libavcodec
parent50240e564673222010678c0c1595b97c4a83f3c9 (diff)
downloadffmpeg-44ba8b650fdde839d186cfc3634060c0b0dd47d1.tar.gz
don't assume quant_matrix[0]==8 in ff_mpeg1_decode_block_intra(). this is required for the Electronic Arts TQI decoder.
Originally committed as revision 17001 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpeg12.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index dd7ecff84c..6100b1f55d 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -630,7 +630,7 @@ inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
dc = s->last_dc[component];
dc += diff;
s->last_dc[component] = dc;
- block[0] = dc<<3;
+ block[0] = dc*quant_matrix[0];
dprintf(s->avctx, "dc=%d diff=%d\n", dc, diff);
i = 0;
{