mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

avdemux: remove duplicate goto block

Browse source
This commit is contained in:
Luis de Bethencourt 2015-03-05 14:25:16 +00:00
parent e3b8a4fe23
commit 18667c5698
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/libav/gstavdemux.c
View file

@ -1156,7 +1156,7 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
res = gst_ffmpeg_pipe_open (&demux->ffpipe, AVIO_FLAG_READ, &iocontext); res = gst_ffmpeg_pipe_open (&demux->ffpipe, AVIO_FLAG_READ, &iocontext);
if (res < 0) if (res < 0)
goto open_failed; goto beach;
demux->context = avformat_alloc_context (); demux->context = avformat_alloc_context ();
demux->context->pb = iocontext; demux->context->pb = iocontext;
@ -1164,12 +1164,12 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
GST_DEBUG_OBJECT (demux, "av_open_input returned %d", res); GST_DEBUG_OBJECT (demux, "av_open_input returned %d", res);
if (res < 0) if (res < 0)
goto open_failed; goto beach;
res = gst_ffmpeg_av_find_stream_info (demux->context); res = gst_ffmpeg_av_find_stream_info (demux->context);
GST_DEBUG_OBJECT (demux, "av_find_stream_info returned %d", res); GST_DEBUG_OBJECT (demux, "av_find_stream_info returned %d", res);
if (res < 0) if (res < 0)
goto no_info; goto beach;
n_streams = demux->context->nb_streams; n_streams = demux->context->nb_streams;
GST_DEBUG_OBJECT (demux, "we have %d streams", n_streams); GST_DEBUG_OBJECT (demux, "we have %d streams", n_streams);
@ -1251,13 +1251,7 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
open_failed: beach:
{
GST_ELEMENT_ERROR (demux, LIBRARY, FAILED, (NULL),
("%s", gst_ffmpegdemux_averror (res)));
return FALSE;
}
no_info:
{ {
GST_ELEMENT_ERROR (demux, LIBRARY, FAILED, (NULL), GST_ELEMENT_ERROR (demux, LIBRARY, FAILED, (NULL),
("%s", gst_ffmpegdemux_averror (res))); ("%s", gst_ffmpegdemux_averror (res)));