generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: factor area out of video stream selection code.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-25 23:59:34 +02:00
parent c5e2347373
commit a7b483953d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg_opt.c
View File

@ -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;
} }
} }