[SCM] libav/experimental: cola test

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:40:13 UTC 2013


The following commit has been merged in the experimental branch:
commit d1700ead3b5aede98980d302959dbab4c1c000f3
Author: Ivan Kalvachev <ikalvachev at gmail.com>
Date:   Thu Apr 29 23:20:46 2004 +0000

    cola test
    
    Originally committed as revision 3089 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index d2500f3..0d6583c 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list