diff options
author | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
commit | 2e1cdcb9e6263a7ca16151713338176ef7b1ee06 (patch) | |
tree | f90c2ac5f9642183106114a81bfb6c979622ea1f /libmpcodecs | |
parent | fc2d040b2248adaac816b999a90ad452ee1f2be6 (diff) | |
download | mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.bz2 mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.xz |
configure, build: remove --disable-libav support
Remove support for building the player without libavcodec and
libavformat. These libraries are now always required.
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index 68d2c44708..0ab5d44971 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -67,9 +67,7 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #endif &mpcodecs_ad_hwac3, &mpcodecs_ad_hwmpa, -#ifdef CONFIG_FFMPEG &mpcodecs_ad_ffmpeg, -#endif &mpcodecs_ad_pcm, &mpcodecs_ad_dvdpcm, &mpcodecs_ad_alaw, diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 564ad2a911..5a96e07783 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -64,9 +64,7 @@ extern const vd_functions_t mpcodecs_vd_qtvideo; const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, -#ifdef CONFIG_FFMPEG &mpcodecs_vd_ffmpeg, -#endif #ifdef CONFIG_OGGTHEORA &mpcodecs_vd_theora, #endif diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 8bd8145042..34790e3d62 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -133,13 +133,13 @@ static const vf_info_t *const filter_list[] = { &vf_info_mirror, &vf_info_palette, &vf_info_pp7, -#ifdef CONFIG_FFMPEG + &vf_info_pp, &vf_info_lavc, &vf_info_lavcdeint, &vf_info_screenshot, &vf_info_uspp, -#endif + &vf_info_dvbscale, &vf_info_cropdetect, &vf_info_test, |