Mercurial > mplayer.hg

diff stream/network.c @ 32142:4614728cab25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build system: Merge all FFmpeg library checks into a single FFmpeg check. There is little point in assuming that some parts of FFmpeg might be available without the others. Plus, mixing and matching static and shared FFmpeg libraries was never supported.
author diego
date Mon, 13 Sep 2010 18:19:25 +0000
parents 4c973cb80fa5
children 01115062cb22
line wrap: on
line diff
--- a/stream/network.c	Mon Sep 13 18:09:29 2010 +0000
+++ b/stream/network.c	Mon Sep 13 18:19:25 2010 +0000
@@ -65,7 +65,7 @@
 
 
 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!