aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pktdumper.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 /tools/pktdumper.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 'tools/pktdumper.c')
-rw-r--r--tools/pktdumper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/pktdumper.c b/tools/pktdumper.c
index ddb4b2b9fb..82f417f9f1 100644
--- a/tools/pktdumper.c
+++ b/tools/pktdumper.c
@@ -89,9 +89,9 @@ int main(int argc, char **argv)
return 1;
}
- err = av_find_stream_info(fctx);
+ err = avformat_find_stream_info(fctx, NULL);
if (err < 0) {
- fprintf(stderr, "av_find_stream_info: error %d\n", err);
+ fprintf(stderr, "avformat_find_stream_info: error %d\n", err);
return 1;
}