[FFmpeg-cvslog] lavf: fix the wrong warning msg and comments about av_find_stream_info

[Jun Zhao]

ffmpeg | branch: master | Jun Zhao <jun.zhao at intel.com> | Mon Dec  5 15:17:13 2016 +0800| [f17eea883a6fc8dbae71fe445ab0c7e925ac2953] | committer: Michael Niedermayer

lavf: fix the wrong warning msg and comments about av_find_stream_info

av_find_stream_info() was deprecated by avformat_find_stream_info(),
correct the warning message in the avformat_find_stream_info() and
comments in the avformat.h

Signed-off-by: Jun Zhao <jun.zhao at intel.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/avformat.h | 4 ++--
 libavformat/utils.c    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 7c69614..adf08d7c 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1007,7 +1007,7 @@ typedef struct AVStream {
      */
 
     /**
-     * Stream information used internally by av_find_stream_info()
+     * Stream information used internally by avformat_find_stream_info()
      */
 #define MAX_STD_TIMEBASES (30*12+30+3+6)
     struct {
@@ -1059,7 +1059,7 @@ typedef struct AVStream {
     int probe_packets;
 
     /**
-     * Number of frames that have been demuxed during av_find_stream_info()
+     * Number of frames that have been demuxed during avformat_find_stream_info()
      */
     int codec_info_nb_frames;
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 482ff15..5f69b6b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3449,7 +3449,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
             && codec && !avctx->codec) {
             if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0)
                 av_log(ic, AV_LOG_WARNING,
-                       "Failed to open codec in av_find_stream_info\n");
+                       "Failed to open codec in %s\n",__FUNCTION__);
         }
 
         // Try to just open decoders, in case this is enough to get parameters.
@@ -3457,7 +3457,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
             if (codec && !avctx->codec)
                 if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0)
                     av_log(ic, AV_LOG_WARNING,
-                           "Failed to open codec in av_find_stream_info\n");
+                           "Failed to open codec in %s\n",__FUNCTION__);
         }
         if (!options)
             av_dict_free(&thread_opt);
@@ -3703,7 +3703,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
                         av_dict_set(&opts, "codec_whitelist", ic->codec_whitelist, 0);
                     if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : &opts) < 0)
                         av_log(ic, AV_LOG_WARNING,
-                            "Failed to open codec in av_find_stream_info\n");
+                               "Failed to open codec in %s\n",__FUNCTION__);
                     av_dict_free(&opts);
                 }
             }