Commit 2cd5f527 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

gst/playback/gststreaminfo.c: Ignore video-codec tag for audio streams and...

gst/playback/gststreaminfo.c: Ignore video-codec tag for audio streams and ignore audio-codec tags for video streams....

Original commit message from CVS:
* gst/playback/gststreaminfo.c: (cb_probe):
Ignore video-codec tag for audio streams and ignore audio-codec tags
for video streams. Should make codec name collection a bit more
robust against sloppy demuxers that send tag events containing both
tags down each pad.
parent d3393980
2007-05-17 Tim-Philipp Müller <tim at centricular dot net>
* gst/playback/gststreaminfo.c: (cb_probe):
Ignore video-codec tag for audio streams and ignore audio-codec tags
for video streams. Should make codec name collection a bit more
robust against sloppy demuxers that send tag events containing both
tags down each pad.
2007-05-17 Wim Taymans <wim@fluendo.com> 2007-05-17 Wim Taymans <wim@fluendo.com>
* gst/playback/gstqueue2.c: (update_rates): * gst/playback/gstqueue2.c: (update_rates):
...@@ -184,12 +184,14 @@ cb_probe (GstPad * pad, GstEvent * e, gpointer user_data) ...@@ -184,12 +184,14 @@ cb_probe (GstPad * pad, GstEvent * e, gpointer user_data)
gst_event_parse_tag (e, &list); gst_event_parse_tag (e, &list);
if (gst_tag_list_get_string (list, GST_TAG_VIDEO_CODEC, &codec)) { if (info->type != GST_STREAM_TYPE_AUDIO &&
gst_tag_list_get_string (list, GST_TAG_VIDEO_CODEC, &codec)) {
g_free (info->codec); g_free (info->codec);
info->codec = codec; info->codec = codec;
GST_LOG_OBJECT (pad, "codec = %s (video)", codec); GST_LOG_OBJECT (pad, "codec = %s (video)", codec);
g_object_notify (G_OBJECT (info), "codec"); g_object_notify (G_OBJECT (info), "codec");
} else if (gst_tag_list_get_string (list, GST_TAG_AUDIO_CODEC, &codec)) { } else if (info->type != GST_STREAM_TYPE_VIDEO &&
gst_tag_list_get_string (list, GST_TAG_AUDIO_CODEC, &codec)) {
g_free (info->codec); g_free (info->codec);
info->codec = codec; info->codec = codec;
GST_LOG_OBJECT (pad, "codec = %s (audio)", codec); GST_LOG_OBJECT (pad, "codec = %s (audio)", codec);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment