From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 26 Aug 2011 15:40:07 +0000 (+0200)
Subject: Replace deprecated av_find_stream_info() by avformat_find_stream_info().
X-Git-Tag: android-x86-4.4-r1~12310^2~36
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c960e67ad0f6b318a5f229bb662c899e7e7570d8;p=android-x86%2Fexternal-ffmpeg.git

Replace deprecated av_find_stream_info() by avformat_find_stream_info().
---

diff --git a/avprobe.c b/avprobe.c
index 3843af9b72..d502421416 100644
--- a/avprobe.c
+++ b/avprobe.c
@@ -277,7 +277,7 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
 
 
     /* fill the streams in the format context */
-    if ((err = av_find_stream_info(fmt_ctx)) < 0) {
+    if ((err = avformat_find_stream_info(fmt_ctx, NULL)) < 0) {
         print_error(filename, err);
         return err;
     }
diff --git a/avserver.c b/avserver.c
index f31b8ddb01..2b028a3f4e 100644
--- a/avserver.c
+++ b/avserver.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);
diff --git a/libavformat/seek-test.c b/libavformat/seek-test.c
index 71b2a2d6c0..3dd60dc160 100644
--- a/libavformat/seek-test.c
+++ b/libavformat/seek-test.c
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-    ret = av_find_stream_info(ic);
+    ret = avformat_find_stream_info(ic, NULL);
     if (ret < 0) {
         fprintf(stderr, "%s: could not find codec parameters\n", filename);
         exit(1);
diff --git a/tools/pktdumper.c b/tools/pktdumper.c
index 80816d24b9..56bc7b7ce0 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;
     }