Mercurial > mplayer.hg
comparison stream/network.c @ 32142:4614728cab25
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 |
comparison
equal
deleted
inserted
replaced
| 32141:2802b8095bf7 | 32142:4614728cab25 |
|---|---|
| 63 /* IPv6 options */ | 63 /* IPv6 options */ |
| 64 int network_ipv4_only_proxy = 0; | 64 int network_ipv4_only_proxy = 0; |
| 65 | 65 |
| 66 | 66 |
| 67 const mime_struct_t mime_type_table[] = { | 67 const mime_struct_t mime_type_table[] = { |
| 68 #ifdef CONFIG_LIBAVFORMAT | 68 #ifdef CONFIG_FFMPEG |
| 69 // Flash Video | 69 // Flash Video |
| 70 { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, | 70 { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, |
| 71 // do not force any demuxer in this case! | 71 // do not force any demuxer in this case! |
| 72 // we want the lavf demuxer to be tried first (happens automatically anyway), | 72 // we want the lavf demuxer to be tried first (happens automatically anyway), |
| 73 // but for mov reference files to work we must also try | 73 // but for mov reference files to work we must also try |