mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/flv/gstflvparse.c: If the caps change during playback and negotiation fails error out instead of trying to continue.

Browse source 
Original commit message from CVS:
* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
(gst_flv_parse_tag_video):
If the caps change during playback and negotiation fails error out
instead of trying to continue.
This commit is contained in:
Sebastian Dröge 2008-10-27 09:35:34 +00:00
parent f577ffb12d
commit 881490ded6
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-10-27 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
(gst_flv_parse_tag_video):
If the caps change during playback and negotiation fails error out
instead of trying to continue.
2008-10-27 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/flv/gstflvmux.c: (gst_flv_mux_audio_pad_setcaps),

11
gst/flv/gstflvparse.c
View file

@ -606,7 +606,11 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, const guint8 * data,
GST_DEBUG_OBJECT (demux, "audio settings have changed, changing caps");
/* Negotiate caps */
gst_flv_parse_audio_negotiate (demux, codec_tag, rate, channels, width);
if (!gst_flv_parse_audio_negotiate (demux, codec_tag, rate, channels,
width)) {
ret = GST_FLOW_ERROR;
goto beach;
}
}
/* Push taglist if present */
@ -907,7 +911,10 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, const guint8 * data,
GST_DEBUG_OBJECT (demux, "video settings have changed, changing caps");
gst_flv_parse_video_negotiate (demux, codec_tag);
if (!gst_flv_parse_video_negotiate (demux, codec_tag)) {
ret = GST_FLOW_ERROR;
goto beach;
}
/* When we ve set pixel-aspect-ratio we use that boolean to detect a
* metadata tag that would come later and trigger a caps change */