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 /stream | |
| 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 'stream')
| -rw-r--r-- | stream/network.c | 2 | ||||
| -rw-r--r-- | stream/stream.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/stream/network.c b/stream/network.c index 48d50d5de5..fc38effde4 100644 --- a/stream/network.c +++ b/stream/network.c @@ -66,7 +66,7 @@ int network_ipv4_only_proxy = 0; const mime_struct_t mime_type_table[] = { -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG // Flash Video { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, // do not force any demuxer in this case! diff --git a/stream/stream.c b/stream/stream.c index 6547771111..8b325a24d1 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -137,7 +137,7 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_LIBBLURAY &stream_info_bluray, #endif -#ifdef CONFIG_LIBAVFORMAT +#ifdef CONFIG_FFMPEG &stream_info_ffmpeg, #endif |