Merge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'

[ffmpeg] / libavfilter / tinterlace.h

diff --git a/libavfilter/tinterlace.h b/libavfilter/tinterlace.h
index d80a6e21798b1f7c0b599a26c28e6bc2540801b1..3b703e7b2141d9060c45e8708ef8412b162f9e44 100644 (file)
--- a/libavfilter/tinterlace.h
+++ b/libavfilter/tinterlace.h
@@ -38,6 +38,7 @@ enum TInterlaceMode {
     MODE_INTERLEAVE_TOP,
     MODE_INTERLEAVE_BOTTOM,
     MODE_INTERLACEX2,
+    MODE_MERGEX2,
     MODE_NB,
 };