summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorLuis de Bethencourt <luis.bg@samsung.com>2015-03-05 14:25:16 +0000
committerLuis de Bethencourt <luis.bg@samsung.com>2015-03-05 14:27:52 +0000
commit18667c56982044d0d08159d66d4f56b01b512093 (patch)
treec863e92142938f28cadc9a6d1f4e578cfc745e6b /ext
parente3b8a4fe230d00246254883788304596daa3449b (diff)
avdemux: remove duplicate goto block
Diffstat (limited to 'ext')
-rw-r--r--ext/libav/gstavdemux.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
index a5966cd..1155d11 100644
--- a/ext/libav/gstavdemux.c
+++ b/ext/libav/gstavdemux.c
@@ -1156,7 +1156,7 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
res = gst_ffmpeg_pipe_open (&demux->ffpipe, AVIO_FLAG_READ, &iocontext);
if (res < 0)
- goto open_failed;
+ goto beach;
demux->context = avformat_alloc_context ();
demux->context->pb = iocontext;
@@ -1164,12 +1164,12 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
GST_DEBUG_OBJECT (demux, "av_open_input returned %d", res);
if (res < 0)
- goto open_failed;
+ goto beach;
res = gst_ffmpeg_av_find_stream_info (demux->context);
GST_DEBUG_OBJECT (demux, "av_find_stream_info returned %d", res);
if (res < 0)
- goto no_info;
+ goto beach;
n_streams = demux->context->nb_streams;
GST_DEBUG_OBJECT (demux, "we have %d streams", n_streams);
@@ -1251,13 +1251,7 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
return TRUE;
/* ERRORS */
-open_failed:
- {
- GST_ELEMENT_ERROR (demux, LIBRARY, FAILED, (NULL),
- ("%s", gst_ffmpegdemux_averror (res)));
- return FALSE;
- }
-no_info:
+beach:
{
GST_ELEMENT_ERROR (demux, LIBRARY, FAILED, (NULL),
("%s", gst_ffmpegdemux_averror (res)));