mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-10-02 01:05:03 +02:00
ffmpeg_opt: Respect default disposition when select audio/video
Respect default disposition when select audio/video Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
This commit is contained in:
parent
9521d7dd58
commit
11d3b03fcb
@ -2198,7 +2198,8 @@ static int open_output_file(OptionsContext *o, const char *filename)
|
|||||||
for (i = 0; i < nb_input_streams; i++) {
|
for (i = 0; i < nb_input_streams; i++) {
|
||||||
int new_area;
|
int new_area;
|
||||||
ist = input_streams[i];
|
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)
|
if (ist->user_set_discard == AVDISCARD_ALL)
|
||||||
continue;
|
continue;
|
||||||
if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
|
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++) {
|
for (i = 0; i < nb_input_streams; i++) {
|
||||||
int score;
|
int score;
|
||||||
ist = input_streams[i];
|
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)
|
if (ist->user_set_discard == AVDISCARD_ALL)
|
||||||
continue;
|
continue;
|
||||||
if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
|
if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
|
||||||
|
Loading…
Reference in New Issue
Block a user