summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_asf.c8
-rw-r--r--src/demuxers/demux_avi.c5
2 files changed, 11 insertions, 2 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index d34e3c4f2..d94a394d8 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.166 2004/12/20 21:22:19 mroi Exp $
+ * $Id: demux_asf.c,v 1.167 2004/12/24 17:43:38 hadess Exp $
*
* demultiplexer for asf streams
*
@@ -510,6 +510,8 @@ static int asf_read_header (demux_asf_t *this) {
asf_stream->buf_type = BUF_AUDIO_UNKNOWN;
}
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, _x_buf_audio_name(asf_stream->buf_type));
+
this->streams[this->num_streams].fifo = this->audio_fifo;
this->streams[this->num_streams].stream_id = stream_id;
this->streams[this->num_streams].frag_offset = 0;
@@ -552,6 +554,10 @@ static int asf_read_header (demux_asf_t *this) {
asf_stream->buf_type = BUF_VIDEO_UNKNOWN;
}
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, _x_buf_video_name(asf_stream->buf_type));
+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);
+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, height);
+
this->streams[this->num_streams].fifo = this->video_fifo;
this->streams[this->num_streams].stream_id = stream_id;
this->streams[this->num_streams].frag_offset = 0;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 3d3b6dc17..9f3e34490 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_avi.c,v 1.212 2004/12/20 21:20:36 mroi Exp $
+ * $Id: demux_avi.c,v 1.213 2004/12/24 17:43:36 hadess Exp $
*
* demultiplexer for avi streams
*
@@ -1922,6 +1922,9 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
_x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, !this->no_audio);
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, _x_buf_video_name(this->avi->video_type));
+ if (!this->no_audio)
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, _x_buf_audio_name(this->avi->audio[0]->audio_type));
/*
* send start/header buffers