[FFmpeg-cvslog] ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input .

Miroslav Slugeň git at videolan.org
Mon Mar 12 03:45:14 CET 2012


ffmpeg | branch: master | Miroslav Slugeň <thunder.m at seznam.cz> | Mon Nov  7 11:48:43 2011 +0100| [00969376cefda9c733217bff139f911c24b16deb] | committer: Michael Niedermayer

ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input.

Fixes Ticket346

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00969376cefda9c733217bff139f911c24b16deb
---

 ffserver.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 5076339..5b041fd 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2161,6 +2161,10 @@ static int open_input_stream(HTTPContext *c, const char *info)
         http_log("could not open %s: %d\n", input_filename, ret);
         return -1;
     }
+
+    /* set buffer size */
+    if (buf_size > 0) ffio_set_buf_size(s->pb, buf_size);
+
     s->flags |= AVFMT_FLAG_GENPTS;
     c->fmt_in = s;
     if (strcmp(s->iformat->name, "ffm") && avformat_find_stream_info(c->fmt_in, NULL) < 0) {
@@ -3664,6 +3668,8 @@ static void build_feed_streams(void)
             int matches = 0;
 
             if (avformat_open_input(&s, feed->feed_filename, NULL, NULL) >= 0) {
+                /* set buffer size */
+                ffio_set_buf_size(s->pb, FFM_PACKET_SIZE);
                 /* Now see if it matches */
                 if (s->nb_streams == feed->nb_streams) {
                     matches = 1;



More information about the ffmpeg-cvslog mailing list