Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / vf_mp.c

diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index 30f073c3d4985c61f61bbb1ca57db0195c1687d3..36e0c1227ef27b779b9de6c729f906da19c86750 100644 (file)
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -126,7 +126,6 @@ extern const vf_info_t vf_info_ass;
 extern const vf_info_t vf_info_bmovl;
 extern const vf_info_t vf_info_crop;
 extern const vf_info_t vf_info_decimate;
-extern const vf_info_t vf_info_delogo;
 extern const vf_info_t vf_info_denoise3d;
 extern const vf_info_t vf_info_detc;
 extern const vf_info_t vf_info_dint;
@@ -197,7 +196,6 @@ extern const vf_info_t vf_info_zrmjpeg;
 static const vf_info_t* const filters[]={
     &vf_info_2xsai,
     &vf_info_decimate,
-    &vf_info_delogo,
     &vf_info_denoise3d,
     &vf_info_detc,
     &vf_info_dint,
@@ -239,6 +237,7 @@ static const vf_info_t* const filters[]={
     &vf_info_softpulldown,
     &vf_info_softskip,
     &vf_info_spp,
+    &vf_info_stereo3d,
     &vf_info_swapuv,
     &vf_info_telecine,
     &vf_info_tile,
@@ -267,7 +266,6 @@ lavcdeint
 noformat
 pp
 scale
-stereo3d
 tfields
 vo
 yadif