In yadif filter, default to top field first if interlacing is unknown

Originally committed as revision 26347 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/filters.texi b/doc/filters.texi
index a66900e1605c3fa969a168de47829703f0eb5d4d..3842886521b369cf4fd10348fbbefe0cbd5af62f 100644 (file)
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -996,6 +996,8 @@ enable automatic detection
 @end table
 
 Default value is -1.
+If interlacing is unknown or decoder does not export this information,
+top field first will be assumed.
 
 @c man end VIDEO FILTERS
 

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index d96e5877e92aeae42d02334a75f232044387f75d..bd0a9de877b93fc28c488e089ad41a3735f01c16 100644 (file)
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -167,7 +167,14 @@ 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^1);
+    int tff;
+
+    if (yadif->parity == -1) {
+        tff = yadif->cur->video->interlaced ?
+            yadif->cur->video->top_field_first : 1;
+    } else {
+        tff = yadif->parity^1;
+    }
 
     if (is_second)
         yadif->out = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE |