diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-10-30 09:42:26 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-10-30 09:42:26 +0000 |
| commit | 793af533ed3bc8f51a7a2b028e824a9de1dc82a0 (patch) | |
| tree | eb25264a107b3ac5735769f0e9bca5377636f34a /src/demuxers | |
| parent | 5d3e565318b6436aed0927640ac548f88ae05f50 (diff) | |
| download | xine-lib-793af533ed3bc8f51a7a2b028e824a9de1dc82a0.tar.gz xine-lib-793af533ed3bc8f51a7a2b028e824a9de1dc82a0.tar.bz2 | |
make xine recognize the new windows media formats and a small audio output plugin loader bugfix
CVS patchset: 914
CVS date: 2001/10/30 09:42:26
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_asf.c | 10 | ||||
| -rw-r--r-- | src/demuxers/demux_avi.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 9b307c5fa..ab6c1c970 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_asf.c,v 1.4 2001/10/25 00:46:58 miguelfreitas Exp $ + * $Id: demux_asf.c,v 1.5 2001/10/30 09:42:26 guenter Exp $ * * demultiplexer for asf streams * @@ -443,6 +443,14 @@ static void asf_send_video_header (demux_asf_t *this, int stream_id) { /* Video in I263 format */ this->streams[this->num_streams].buf_type = BUF_VIDEO_I263; break; + case mmioFOURCC('W','M','V','1'): + /* Windows Media Video 7 */ + this->streams[this->num_streams].buf_type = BUF_VIDEO_WMV7; + break; + case mmioFOURCC('W','M','V','2'): + /* Windows Media Video 8 */ + this->streams[this->num_streams].buf_type = BUF_VIDEO_WMV8; + break; default: printf ("demux_asf: unknown video format %.4s\n", (char*)&bih->biCompression); diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 14ce27f6b..b3e8c9996 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_avi.c,v 1.47 2001/10/25 00:46:58 miguelfreitas Exp $ + * $Id: demux_avi.c,v 1.48 2001/10/30 09:42:26 guenter Exp $ * * demultiplexer for avi streams * @@ -1066,6 +1066,14 @@ static void demux_avi_start (demux_plugin_t *this_gen, /* Video in I263 format */ this->avi->video_type = BUF_VIDEO_I263; break; + case mmioFOURCC('W','M','V','1'): + /* Windows Media Video 7 */ + this->avi->video_type = BUF_VIDEO_WMV7; + break; + case mmioFOURCC('W','M','V','2'): + /* Windows Media Video 8 */ + this->avi->video_type = BUF_VIDEO_WMV8; + break; default: printf ("demux_avi: unknown avi format %.4s\n", (char*)&this->avi->bih.biCompression); |