summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-26 23:18:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-26 23:18:54 +0200
commit094a4968188b0129d674c1369bad45a86cd0d46d (patch)
tree372eb9e7a5dc4222b7db34c5e10ae578b536ed9b /ffserver.c
parent0a1cf6621067c4a85b519c8cad5c345c29017f89 (diff)
parent1717ba0cdd587fe3463c1d8560f2c7e13fb21ba3 (diff)
downloadffmpeg-094a4968188b0129d674c1369bad45a86cd0d46d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: fifo: add FIFO API test program, and fate test fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() postprocess.c: filter name needs to be double 0 terminated doxygen: fix wrong comment syntax, //< vs. ///< doxygen: drop pointless star from pointer variable names Replace deprecated av_find_stream_info() by avformat_find_stream_info(). xmv: eliminate superfluous zeroing of zero data configure: fix typo in avconv dependency list Conflicts: configure doc/APIchanges libavutil/Makefile libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c
index 1795a2a29c..f0bdb828b2 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2162,7 +2162,7 @@ static int open_input_stream(HTTPContext *c, const char *info)
}
s->flags |= AVFMT_FLAG_GENPTS;
c->fmt_in = s;
- if (strcmp(s->iformat->name, "ffm") && av_find_stream_info(c->fmt_in) < 0) {
+ if (strcmp(s->iformat->name, "ffm") && avformat_find_stream_info(c->fmt_in, NULL) < 0) {
http_log("Could not find stream info '%s'\n", input_filename);
av_close_input_file(s);
return -1;
@@ -3621,7 +3621,7 @@ static void build_file_streams(void)
} else {
/* find all the AVStreams inside and reference them in
'stream' */
- if (av_find_stream_info(infile) < 0) {
+ if (avformat_find_stream_info(infile, NULL) < 0) {
http_log("Could not find codec parameters from '%s'\n",
stream->feed_filename);
av_close_input_file(infile);