Skip to content

F
ffmpeg
Commit a7b48395 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

ffmpeg: factor area out of video stream selection code. 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c5e23473
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
ffmpeg_opt.c
View file @ a7b48395
...@@ -1496,12 +1496,14 @@ void opt_output_file(void *optctx, const char *filename) ...@@ -1496,12 +1496,14 @@ void opt_output_file(void *optctx, const char *filename)
int area = 0, idx = -1; int area = 0, idx = -1;
int qcr = avformat_query_codec(oc->oformat, oc->oformat->video_codec, 0); int qcr = avformat_query_codec(oc->oformat, oc->oformat->video_codec, 0);
for (i = 0; i < nb_input_streams; i++) { for (i = 0; i < nb_input_streams; i++) {
int new_area;
ist = input_streams[i]; ist = input_streams[i];
new_area = ist->st->codec->width * ist->st->codec->height;
if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
ist->st->codec->width * ist->st->codec->height > area) { new_area > area) {
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))
continue; continue;
area = ist->st->codec->width * ist->st->codec->height; area = new_area;
idx = i; idx = i;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment