ffmpeg: dont auto match videostreams with attachment pics.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · 22d804b7f0
parent f9f11c1000
commit 22d804b7f0
1 changed files with 3 additions and 0 deletions
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@ -1449,10 +1449,13 @@ void opt_output_file(void *optctx, const char *filename)
        /* video: highest resolution */
        if (!o->video_disable && oc->oformat->video_codec != AV_CODEC_ID_NONE) {
            int area = 0, idx = -1;
+            int qcr = avformat_query_codec(oc->oformat, oc->oformat->video_codec, 0);
            for (i = 0; i < nb_input_streams; i++) {
                ist = input_streams[i];
                if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
                    ist->st->codec->width * ist->st->codec->height > area) {
+                    if((qcr==MKTAG('A', 'P', 'I', 'C')) && !(ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
+                        continue;
                    area = ist->st->codec->width * ist->st->codec->height;
                    idx = i;
                }