summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-07 01:51:37 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-07 01:51:37 +0200
commit15f812898fa32db55681376df3fea759519167b9 (patch)
tree234f83811001a331802b7539c401e141c5f091f7 /libmpcodecs
parentc3c0309eecc1d6b309138fcd40df508235c9395d (diff)
downloadmpv-15f812898fa32db55681376df3fea759519167b9.tar.bz2
mpv-15f812898fa32db55681376df3fea759519167b9.tar.xz
vf: Fix filter enabling logic for vf_uspp and vfs using lavc internals
Move vf_uspp from the list of filters depending on internal non-API FFmpeg code to the list of filters only depending on libavcodec normally - at least it doesn't need any internal headers, and I don't see other obvious unsafe non-API usage either. Change a leftover CONFIG_LIBAVCODEC_A test to the now correct CONFIG_LIBAVCODEC_INTERNALS to actually allow using the video filters requiring non-API libavcodec internals when --ffmpeg-source-dir was specified.
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 6c935a219b..5e7d1b4768 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -134,6 +134,7 @@ static const vf_info_t* const filter_list[]={
&vf_info_lavc,
&vf_info_lavcdeint,
&vf_info_screenshot,
+ &vf_info_uspp,
#endif
#ifdef CONFIG_ZR
&vf_info_zrmjpeg,
@@ -180,9 +181,8 @@ static const vf_info_t* const filter_list[]={
&vf_info_delogo,
&vf_info_remove_logo,
&vf_info_hue,
-#ifdef CONFIG_LIBAVCODEC_A
+#ifdef CONFIG_LIBAVCODEC_INTERNALS
&vf_info_spp,
- &vf_info_uspp,
&vf_info_fspp,
&vf_info_qp,
&vf_info_mcdeint,