[SCM] libav/experimental: Fix 0 vs 1 porting bug from mplayer.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 96a1459ed58ca0afef31327564f97bb28fa498c0
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Sep 25 16:54:09 2010 +0000

    Fix 0 vs 1 porting bug from mplayer.
    
    Originally committed as revision 25197 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index b2b2fe5..96cf73a 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -167,7 +167,7 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, int w,
 static void return_frame(AVFilterContext *ctx, int is_second){
     YADIFContext *yadif = ctx->priv;
     AVFilterLink *link= ctx->outputs[0];
-    int tff = yadif->parity == -1 ? yadif->cur->video->top_field_first : yadif->parity;
+    int tff = yadif->parity == -1 ? yadif->cur->video->top_field_first : (yadif->parity^1);
 
     if(is_second)
         yadif->out = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE |

-- 
Libav/FFmpeg packaging