Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: fix the wrong warning msg and comments about av_find_stream_info

Browse Source 
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@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/241/head
Jun Zhao 8 years ago committed by Michael Niedermayer
parent a5d25faa3f
commit f17eea883a
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavformat/avformat.h
  2. 6
      libavformat/utils.c

4
libavformat/avformat.h
Unescape View File

@ -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) #define MAX_STD_TIMEBASES (30*12+30+3+6)
struct { struct {
@ -1059,7 +1059,7 @@ typedef struct AVStream {
int probe_packets; 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; int codec_info_nb_frames;

6
libavformat/utils.c
Unescape View File

@ -3449,7 +3449,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
&& codec && !avctx->codec) { && codec && !avctx->codec) {
if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0)
av_log(ic, AV_LOG_WARNING, 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. // 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 (codec && !avctx->codec)
if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0)
av_log(ic, AV_LOG_WARNING, 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) if (!options)
av_dict_free(&thread_opt); av_dict_free(&thread_opt);
@ -3703,7 +3703,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_dict_set(&opts, "codec_whitelist", ic->codec_whitelist, 0); 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) if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : &opts) < 0)
av_log(ic, AV_LOG_WARNING, 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); av_dict_free(&opts);
} }
} }

Write Preview
Loading…
Cancel
Save