summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-07-11 16:32:54 +0200
committerDiego Biurrun <diego@biurrun.de>2011-07-13 17:53:49 +0200
commit71a1d1116fd952f348d732c19ba7f4ebe041ce26 (patch)
tree33dde87b6763e9b3b5cdbfe5462ac752e01431fb /ffserver.c
parent191c5f8ff33eb995b6dbc5b11af7c1a79f8381f0 (diff)
Replace some gotos that lead to single return statements by direct return.
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ffserver.c b/ffserver.c
index 1dc8a17f2f..ca4b54f4d4 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3508,7 +3508,7 @@ static int add_av_stream(FFStream *feed, AVStream *st)
case AVMEDIA_TYPE_AUDIO:
if (av1->channels == av->channels &&
av1->sample_rate == av->sample_rate)
- goto found;
+ return i;
break;
case AVMEDIA_TYPE_VIDEO:
if (av1->width == av->width &&
@@ -3516,7 +3516,7 @@ static int add_av_stream(FFStream *feed, AVStream *st)
av1->time_base.den == av->time_base.den &&
av1->time_base.num == av->time_base.num &&
av1->gop_size == av->gop_size)
- goto found;
+ return i;
break;
default:
abort();
@@ -3528,8 +3528,6 @@ static int add_av_stream(FFStream *feed, AVStream *st)
if (!fst)
return -1;
return feed->nb_streams - 1;
- found:
- return i;
}
static void remove_stream(FFStream *stream)