mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/: Set codec_data on caps for avidemuxer.

Browse source 
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.
This commit is contained in:
Wim Taymans 2004-07-13 10:24:29 +00:00
parent ab02779260
commit 872a055c55
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2004-07-13 Wim Taymans <wim@fluendo.com>
* 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 <ds@schleef.org> 2004-07-12 David Schleef <ds@schleef.org>
* configure.ac: Fix test for Objective C * configure.ac: Fix test for Objective C

7
gst/avi/gstavidemux.c
View file

@ -779,7 +779,7 @@ gst_avi_demux_add_stream (GstAviDemux * avi)
return FALSE; return FALSE;
break; break;
case GST_RIFF_FCC_auds: 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; return FALSE;
break; break;
case GST_RIFF_FCC_iavs: 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); padname = g_strdup_printf ("audio_%02d", avi->num_a_streams);
templ = gst_element_class_get_pad_template (klass, "audio_%02d"); templ = gst_element_class_get_pad_template (klass, "audio_%02d");
caps = gst_riff_create_audio_caps (strf.auds->format, strh, strf.auds, caps =
&codec_name); 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, gst_tag_list_add (list, GST_TAG_MERGE_APPEND, GST_TAG_AUDIO_CODEC,
codec_name, NULL); codec_name, NULL);
gst_element_found_tags (GST_ELEMENT (avi), list); gst_element_found_tags (GST_ELEMENT (avi), list);