diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-01-16 20:10:12 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-01-19 00:32:08 +0100 |
| commit | d00df260ca3341e5cacdd53fb08c42b05fb1d442 (patch) | |
| tree | 5dbbf67ce3942d6e50fdd2eff82ba1b6936abb69 /libavformat/segment.c | |
| parent | bbce913edfd8486e516a9335286c4d91b6728663 (diff) | |
| download | ffmpeg-d00df260ca3341e5cacdd53fb08c42b05fb1d442.tar.gz | |
lavf/segment: do not auto-select a video stream with attached_pic disposition
In particular, fix trac ticket #2138.
Diffstat (limited to 'libavformat/segment.c')
| -rw-r--r-- | libavformat/segment.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index d7f9cc30c8..bf8c70c61b 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -475,7 +475,9 @@ static int select_reference_stream(AVFormatContext *s) /* select first index for each type */ for (i = 0; i < s->nb_streams; i++) { type = s->streams[i]->codec->codec_type; - if ((unsigned)type < AVMEDIA_TYPE_NB && type_index_map[type] == -1) + if ((unsigned)type < AVMEDIA_TYPE_NB && type_index_map[type] == -1 + /* ignore attached pictures/cover art streams */ + && !(s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) type_index_map[type] = i; } |