Message ID | 20180602160738.8526-1-jeebjp@gmail.com |
---|---|
State | Accepted |
Commit | 76daf4529bf2b1f8c6445a64437013bd0cf297aa |
Headers | show |
On Sat, Jun 2, 2018 at 7:07 PM, Jan Ekström <jeebjp@gmail.com> wrote: > These files depend on libavformat, and the vf_srcnn filter > currently is the only thing utilizing these dnn_* files and > already happens to have a dependency on libavformat. > > This fixes compilation in cases where libavformat is not a > dependency for libavfilter. > > Reported by Kam_ on IRC. > --- Got two LGTMs on IRC, pushed to master. Jan
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 5bacd5b621..4303e80097 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -12,8 +12,6 @@ OBJS = allfilters.o \ avfiltergraph.o \ buffersink.o \ buffersrc.o \ - dnn_interface.o \ - dnn_backend_native.o \ drawutils.o \ fifo.o \ formats.o \ @@ -338,7 +336,7 @@ OBJS-$(CONFIG_SMARTBLUR_FILTER) += vf_smartblur.o OBJS-$(CONFIG_SOBEL_FILTER) += vf_convolution.o OBJS-$(CONFIG_SPLIT_FILTER) += split.o OBJS-$(CONFIG_SPP_FILTER) += vf_spp.o -OBJS-$(CONFIG_SRCNN_FILTER) += vf_srcnn.o +OBJS-$(CONFIG_SRCNN_FILTER) += vf_srcnn.o dnn_interface.o dnn_backend_native.o OBJS-$(CONFIG_SSIM_FILTER) += vf_ssim.o framesync.o OBJS-$(CONFIG_STEREO3D_FILTER) += vf_stereo3d.o OBJS-$(CONFIG_STREAMSELECT_FILTER) += f_streamselect.o framesync.o