[SCM] libav/experimental: avoid some halfpel related #ifdef

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 87246a01cfe2aa2c093dd8b787d18278be9b80cf
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Thu Nov 15 22:32:39 2007 +0000

    avoid some halfpel related #ifdef
    
    Originally committed as revision 11041 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 8c8c631..eb5a916 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -4139,7 +4139,8 @@ static int encode_init(AVCodecContext *avctx)
     return 0;
 }
 
-#ifdef USE_HALFPEL_PLANE
+#define USE_HALFPEL_PLANE 0
+
 static void halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *frame){
     int p,x,y;
 
@@ -4183,7 +4184,6 @@ static void halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *fr
 //FIXME border!
     }
 }
-#endif /* USE_HALFPEL_PLANE */
 
 static int frame_start(SnowContext *s){
    AVFrame tmp;
@@ -4199,10 +4199,8 @@ static int frame_start(SnowContext *s){
     tmp= s->last_picture[s->max_ref_frames-1];
     memmove(s->last_picture+1, s->last_picture, (s->max_ref_frames-1)*sizeof(AVFrame));
     memmove(s->halfpel_plane+1, s->halfpel_plane, (s->max_ref_frames-1)*sizeof(void*)*4*4);
-#ifdef USE_HALFPEL_PLANE
-    if(s->current_picture.data[0])
+    if(USE_HALFPEL_PLANE && s->current_picture.data[0])
         halfpel_interpol(s, s->halfpel_plane[0], &s->current_picture);
-#endif
     s->last_picture[0]= s->current_picture;
     s->current_picture= tmp;
 

-- 
Libav/FFmpeg packaging