From 872a055c55f0658ef568769022bce7a785c819d5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 13 Jul 2004 10:24:29 +0000 Subject: [PATCH] gst/: Set codec_data on caps for avidemuxer. Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps_with_data), (gst_riff_create_audio_caps), (gst_riff_create_audio_template_caps): * gst-libs/gst/riff/riff-media.h: * gst-libs/gst/riff/riff-read.c: (gst_riff_read_strf_vids_with_data), (gst_riff_read_strf_auds_with_data), (gst_riff_read_strf_auds): * gst-libs/gst/riff/riff-read.h: * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), (gst_avi_demux_add_stream): Set codec_data on caps for avidemuxer. --- ChangeLog | 15 +++++++++++++++ gst/avi/gstavidemux.c | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76d1b45e87..061511d33c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2004-07-13 Wim Taymans + + * gst-libs/gst/riff/riff-media.c: + (gst_riff_create_audio_caps_with_data), + (gst_riff_create_audio_caps), + (gst_riff_create_audio_template_caps): + * gst-libs/gst/riff/riff-media.h: + * gst-libs/gst/riff/riff-read.c: + (gst_riff_read_strf_vids_with_data), + (gst_riff_read_strf_auds_with_data), (gst_riff_read_strf_auds): + * gst-libs/gst/riff/riff-read.h: + * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query), + (gst_avi_demux_add_stream): + Set codec_data on caps for avidemuxer. + 2004-07-12 David Schleef * configure.ac: Fix test for Objective C diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 11c95ded07..e4035bc927 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -779,7 +779,7 @@ gst_avi_demux_add_stream (GstAviDemux * avi) return FALSE; break; case GST_RIFF_FCC_auds: - if (!gst_riff_read_strf_auds (riff, &strf.auds)) + if (!gst_riff_read_strf_auds_with_data (riff, &strf.auds, &extradata)) return FALSE; break; case GST_RIFF_FCC_iavs: @@ -861,8 +861,9 @@ gst_avi_demux_add_stream (GstAviDemux * avi) padname = g_strdup_printf ("audio_%02d", avi->num_a_streams); templ = gst_element_class_get_pad_template (klass, "audio_%02d"); - caps = gst_riff_create_audio_caps (strf.auds->format, strh, strf.auds, - &codec_name); + caps = + gst_riff_create_audio_caps_with_data (strf.auds->format, strh, + strf.auds, extradata, initdata, &codec_name); gst_tag_list_add (list, GST_TAG_MERGE_APPEND, GST_TAG_AUDIO_CODEC, codec_name, NULL); gst_element_found_tags (GST_ELEMENT (avi), list);