aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Kalvachev <ikalvachev@gmail.com>2004-04-29 23:20:46 +0000
committerIvan Kalvachev <ikalvachev@gmail.com>2004-04-29 23:20:46 +0000
commitd1700ead3b5aede98980d302959dbab4c1c000f3 (patch)
tree9ffdba1c1758b85b274afd25673b15875505320b
parent000a9c02db82684bc91751f7f41864df98b5f88a (diff)
downloadffmpeg-d1700ead3b5aede98980d302959dbab4c1c000f3.tar.gz
cola test
Originally committed as revision 3089 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpeg12.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index d2500f393d..0d6583c890 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -358,14 +358,10 @@ static inline void encode_mb_skip_run(MpegEncContext *s, int run){
static void common_init(MpegEncContext *s)
{
-int i;
s->y_dc_scale_table=
s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
- if(!s->encoding)
- for(i=0;i<64;i++)
- s->dsp.idct_permutation[i]=i;
}
void ff_mpeg1_clean_buffers(MpegEncContext *s){
@@ -1763,7 +1759,14 @@ static int mpeg_decode_init(AVCodecContext *avctx)
{
Mpeg1Context *s = avctx->priv_data;
MpegEncContext *s2 = &s->mpeg_enc_ctx;
+ int i;
+ //we need some parmutation to store
+ //matrixes, until MPV_common_init()
+ //set the real permutatuon
+ for(i=0;i<64;i++)
+ s2->dsp.idct_permutation[i]=i;
+
MPV_decode_defaults(s2);
s->mpeg_enc_ctx.avctx= avctx;