aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-22 03:30:53 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-22 03:30:53 +0000
commit697efa36c72280caf0b6bca74180e27a0bedd666 (patch)
treef04eedc2a0a201a35a709f5731e408178840adf7
parente6f0deab806f518f55ee54b970f70de1948bbf5d (diff)
downloadffmpeg-697efa36c72280caf0b6bca74180e27a0bedd666.tar.gz
move code after possible failure, so no need to free
Originally committed as revision 13875 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffserver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c
index 24996d3534..c982b3a6c9 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2486,14 +2486,14 @@ static int http_receive_data(HTTPContext *c)
AVInputFormat *fmt_in;
int i;
- url_open_buf(&pb, c->buffer, c->buffer_end - c->buffer, URL_RDONLY);
- pb->is_streamed = 1;
-
/* use feed output format name to find corresponding input format */
fmt_in = av_find_input_format(feed->fmt->name);
if (!fmt_in)
goto fail;
+ url_open_buf(&pb, c->buffer, c->buffer_end - c->buffer, URL_RDONLY);
+ pb->is_streamed = 1;
+
if (av_open_input_stream(&s, pb, c->stream->feed_filename, fmt_in, NULL) < 0) {
av_free(pb);
goto fail;