From: Jun Zhao <barryjz...@tencent.com>
Respect default disposition when select audio/video
Signed-off-by: Jun Zhao <barryjz...@tencent.com>
---
fftools/ffmpeg_opt.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 53d688b..f5ca18a 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -2198,7 +2198,8 @@ static int open_output_file(OptionsContext *o, const char
*filename)
for (i = 0; i < nb_input_streams; i++) {
int new_area;
ist = input_streams[i];
- new_area = ist->st->codecpar->width *
ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames;
+ new_area = ist->st->codecpar->width *
ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames
+ + 5000000*!!(ist->st->disposition &
AV_DISPOSITION_DEFAULT);
if (ist->user_set_discard == AVDISCARD_ALL)
continue;
if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition &
AV_DISPOSITION_ATTACHED_PIC))
@@ -2221,7 +2222,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->channels +
100000000*!!ist->st->codec_info_nb_frames;
+ score = ist->st->codecpar->channels +
100000000*!!ist->st->codec_info_nb_frames
+ + 5000000*!!(ist->st->disposition &
AV_DISPOSITION_DEFAULT);
if (ist->user_set_discard == AVDISCARD_ALL)
continue;
if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
--
1.7.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
