[SCM] libav/experimental: move code after possible failure, so no need to free
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:23:57 UTC 2013
The following commit has been merged in the experimental branch:
commit 697efa36c72280caf0b6bca74180e27a0bedd666
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sun Jun 22 03:30:53 2008 +0000
move code after possible failure, so no need to free
Originally committed as revision 13875 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index 24996d3..c982b3a 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list