Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 22971:a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
before our native demuxers and remove some now unneeded file-extension
hacks.
| author | reimar |
|---|---|
| date | Sat, 14 Apr 2007 10:03:42 +0000 |
| parents | 4d81dbdf46b9 |
| children | 93948eb0280f |
comparison
equal
deleted
inserted
replaced
| 22970:fa6ecee55d98 | 22971:a1b2fbb000fc |
|---|---|
| 62 extern demuxer_desc_t demuxer_desc_audio; | 62 extern demuxer_desc_t demuxer_desc_audio; |
| 63 extern demuxer_desc_t demuxer_desc_xmms; | 63 extern demuxer_desc_t demuxer_desc_xmms; |
| 64 extern demuxer_desc_t demuxer_desc_mpeg_ty; | 64 extern demuxer_desc_t demuxer_desc_mpeg_ty; |
| 65 extern demuxer_desc_t demuxer_desc_rtp; | 65 extern demuxer_desc_t demuxer_desc_rtp; |
| 66 extern demuxer_desc_t demuxer_desc_lavf; | 66 extern demuxer_desc_t demuxer_desc_lavf; |
| 67 extern demuxer_desc_t demuxer_desc_lavf_preferred; | |
| 67 extern demuxer_desc_t demuxer_desc_aac; | 68 extern demuxer_desc_t demuxer_desc_aac; |
| 68 extern demuxer_desc_t demuxer_desc_nut; | 69 extern demuxer_desc_t demuxer_desc_nut; |
| 69 | 70 |
| 70 demuxer_desc_t* demuxer_list[] = { | 71 demuxer_desc_t* demuxer_list[] = { |
| 71 &demuxer_desc_rawaudio, | 72 &demuxer_desc_rawaudio, |
| 72 &demuxer_desc_rawvideo, | 73 &demuxer_desc_rawvideo, |
| 73 #ifdef USE_TV | 74 #ifdef USE_TV |
| 74 &demuxer_desc_tv, | 75 &demuxer_desc_tv, |
| 75 #endif | 76 #endif |
| 76 &demuxer_desc_mf, | 77 &demuxer_desc_mf, |
| 78 &demuxer_desc_lavf_preferred, | |
| 77 &demuxer_desc_avi, | 79 &demuxer_desc_avi, |
| 78 &demuxer_desc_y4m, | 80 &demuxer_desc_y4m, |
| 79 &demuxer_desc_asf, | 81 &demuxer_desc_asf, |
| 80 &demuxer_desc_nsv, | 82 &demuxer_desc_nsv, |
| 81 &demuxer_desc_nuv, | 83 &demuxer_desc_nuv, |