From 2e1cdcb9e6263a7ca16151713338176ef7b1ee06 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 11 Dec 2011 07:48:26 +0200 Subject: configure, build: remove --disable-libav support Remove support for building the player without libavcodec and libavformat. These libraries are now always required. --- stream/network.c | 2 -- stream/stream.c | 2 -- 2 files changed, 4 deletions(-) (limited to 'stream') diff --git a/stream/network.c b/stream/network.c index ce04444144..0961c8d12b 100644 --- a/stream/network.c +++ b/stream/network.c @@ -65,7 +65,6 @@ int network_ipv4_only_proxy = 0; const mime_struct_t mime_type_table[] = { -#ifdef CONFIG_FFMPEG // Flash Video { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, // do not force any demuxer in this case! @@ -73,7 +72,6 @@ const mime_struct_t mime_type_table[] = { // but for mov reference files to work we must also try // the native demuxer if lavf fails. { "video/quicktime", 0 }, -#endif // MP3 streaming, some MP3 streaming server answer with audio/mpeg { "audio/mpeg", DEMUXER_TYPE_AUDIO }, // MPEG streaming diff --git a/stream/stream.c b/stream/stream.c index fc5185827b..99225ca3b4 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -140,9 +140,7 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_LIBBLURAY &stream_info_bluray, #endif -#ifdef CONFIG_FFMPEG &stream_info_ffmpeg, -#endif &stream_info_null, &stream_info_mf, -- cgit v1.2.3