[SCM] libav/experimental: * oops fixed bad initialization of ff vals. - put FF_LIBMPEG2_IDCT_PERM into CVS - so it will work for now

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


The following commit has been merged in the experimental branch:
commit 594026277250fecf0ba34c9e1498921936c6bfed
Author: Zdenek Kabelac <kabi at informatics.muni.cz>
Date:   Tue Nov 19 10:08:31 2002 +0000

    * oops fixed bad initialization of ff vals.
      - put FF_LIBMPEG2_IDCT_PERM into CVS - so it will work for now
    
    Originally committed as revision 1227 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c
index a3fa8b7..ea16935 100644
--- a/libavcodec/armv4l/mpegvideo_arm.c
+++ b/libavcodec/armv4l/mpegvideo_arm.c
@@ -44,12 +44,12 @@ void MPV_common_init_armv4l(MpegEncContext *s)
     int i;
     const int idct_algo= s->avctx->idct_algo;
 
-    ff_put_pixels_clamped = s->avctx->dsp.put_pixels_clamped;
-    ff_add_pixels_clamped = s->avctx->dsp.put_pixels_clamped;
+    ff_put_pixels_clamped = s->dsp.put_pixels_clamped;
+    ff_add_pixels_clamped = s->dsp.put_pixels_clamped;
 
     if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_ARM){
         s->idct_put= arm_idct_put;
         s->idct_add= arm_idct_add;
-        s->idct_permutation_type= FF_NO_IDCT_PERM;
+        s->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */
     }
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list