generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Fixes Ticket346

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Miroslav Slugeň 2011-11-07 11:48:43 +01:00 committed by Michael Niedermayer
parent 9fcc62ed9b
commit 00969376ce
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffserver.c
View File

@ -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); http_log("could not open %s: %d\n", input_filename, ret);
return -1; return -1;
} }
/* set buffer size */
if (buf_size > 0) ffio_set_buf_size(s->pb, buf_size);
s->flags |= AVFMT_FLAG_GENPTS; s->flags |= AVFMT_FLAG_GENPTS;
c->fmt_in = s; c->fmt_in = s;
if (strcmp(s->iformat->name, "ffm") && avformat_find_stream_info(c->fmt_in, NULL) < 0) { 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; int matches = 0;
if (avformat_open_input(&s, feed->feed_filename, NULL, NULL) >= 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 */ /* Now see if it matches */
if (s->nb_streams == feed->nb_streams) { if (s->nb_streams == feed->nb_streams) {
matches = 1; matches = 1;