[FFmpeg-cvslog] ffmpeg.c: stop accessing private AVStream.codec_info_nb_frames
Anton Khirnov
git at videolan.org
Wed Oct 28 15:26:43 EET 2020
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 25 15:50:55 2020 +0100| [87f0c8280c7556b52b72b9379547eed77e9810d7] | committer: Anton Khirnov
ffmpeg.c: stop accessing private AVStream.codec_info_nb_frames
Use AVSTREAM_EVENT_FLAG_NEW_PACKETS instead, which should provide the
same information in this case.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87f0c8280c7556b52b72b9379547eed77e9810d7
---
fftools/ffmpeg_opt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index a0d1b06f2d..d58462b6ae 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -2215,7 +2215,8 @@ static int open_output_file(OptionsContext *o, const char *filename)
for (i = 0; i < nb_input_streams; i++) {
int score;
ist = input_streams[i];
- score = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames
+ score = ist->st->codecpar->width * ist->st->codecpar->height
+ + 100000000 * !!(ist->st->event_flags & AVSTREAM_EVENT_FLAG_NEW_PACKETS)
+ 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT);
if (ist->user_set_discard == AVDISCARD_ALL)
continue;
More information about the ffmpeg-cvslog
mailing list