Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 17354:60189cd9bbc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added support for external libavformat
author nicodvb
date Mon, 09 Jan 2006 19:35:44 +0000
parents a1b8eeffdfcd
children 934380353fd6
comparison
equal deleted inserted replaced
17353:0bc4869be931 17354:60189cd9bbc8
60 extern demuxer_desc_t demuxer_desc_mpc; 60 extern demuxer_desc_t demuxer_desc_mpc;
61 extern demuxer_desc_t demuxer_desc_audio; 61 extern demuxer_desc_t demuxer_desc_audio;
62 extern demuxer_desc_t demuxer_desc_xmms; 62 extern demuxer_desc_t demuxer_desc_xmms;
63 extern demuxer_desc_t demuxer_desc_mpeg_ty; 63 extern demuxer_desc_t demuxer_desc_mpeg_ty;
64 extern demuxer_desc_t demuxer_desc_rtp; 64 extern demuxer_desc_t demuxer_desc_rtp;
65 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
65 extern demuxer_desc_t demuxer_desc_lavf; 66 extern demuxer_desc_t demuxer_desc_lavf;
67 #endif
66 extern demuxer_desc_t demuxer_desc_aac; 68 extern demuxer_desc_t demuxer_desc_aac;
67 69
68 demuxer_desc_t* demuxer_list[] = { 70 demuxer_desc_t* demuxer_list[] = {
69 &demuxer_desc_rawaudio, 71 &demuxer_desc_rawaudio,
70 &demuxer_desc_rawvideo, 72 &demuxer_desc_rawvideo,
117 #endif 119 #endif
118 &demuxer_desc_mpeg_ty, 120 &demuxer_desc_mpeg_ty,
119 #ifdef STREAMING_LIVE555 121 #ifdef STREAMING_LIVE555
120 &demuxer_desc_rtp, 122 &demuxer_desc_rtp,
121 #endif 123 #endif
122 #ifdef USE_LIBAVFORMAT 124 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
123 &demuxer_desc_lavf, 125 &demuxer_desc_lavf,
124 #endif 126 #endif
125 &demuxer_desc_aac, 127 &demuxer_desc_aac,
126 NULL 128 NULL
127 }; 129 };