diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-10-31 03:19:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:16:55 +0200 |
| commit | c5e462b33d6db445b1c763e89320b1bcb214debb (patch) | |
| tree | 5091b402fb3cc768fa5dbc718d5681d3d78d191f /libmpcodecs | |
| parent | 389c32b5c72897a8b1b3c929c8f278e8980f2290 (diff) | |
| download | mpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.bz2 mpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.xz | |
build: enable/disable all FFmpeg libraries together
Enable all of libavcodec, libavformat, libswscale, and libpostproc
together (libavutil is always required).
based on svn commit by diego:
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf.c | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index 296d65114a..2e431e6c48 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -71,7 +71,7 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #endif &mpcodecs_ad_hwac3, &mpcodecs_ad_hwmpa, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &mpcodecs_ad_ffmpeg, #endif &mpcodecs_ad_pcm, diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 1e7d87312b..c7c0b58759 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -65,7 +65,7 @@ extern const vd_functions_t mpcodecs_vd_qtvideo; const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG &mpcodecs_vd_ffmpeg, #endif #ifdef CONFIG_OGGTHEORA diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 71ead4ae2d..b3e635dbaf 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -126,9 +126,6 @@ static const vf_info_t* const filter_list[]={ #endif &vf_info_crop, &vf_info_expand, -#ifdef CONFIG_LIBPOSTPROC - &vf_info_pp, -#endif &vf_info_scale, // &vf_info_osd, &vf_info_vo, @@ -139,7 +136,8 @@ static const vf_info_t* const filter_list[]={ &vf_info_mirror, &vf_info_palette, &vf_info_pp7, -#ifdef CONFIG_LIBAVCODEC +#ifdef CONFIG_FFMPEG + &vf_info_pp, &vf_info_lavc, &vf_info_lavcdeint, &vf_info_screenshot, @@ -188,7 +186,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_delogo, &vf_info_remove_logo, &vf_info_hue, -#ifdef CONFIG_LIBAVCODEC_INTERNALS +#ifdef CONFIG_FFMPEG_INTERNALS &vf_info_spp, &vf_info_fspp, &vf_info_qp, |