summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-03-18 17:35:49 +0100
committerAnton Khirnov <anton@khirnov.net>2012-03-20 06:53:44 +0100
commit40b41be3fa6c5bc3b064ffec97096524ac33af4d (patch)
treeef82f0c6391c377f9862e42f193ed406a5105ccb /libavformat
parent01fcc42b909e7328e177748ffb21f2846b924a09 (diff)
lavf: use AVStream.discard to disable queueing attached pictures.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7fd425f1cc..d17b5752f1 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -519,7 +519,8 @@ static void queue_attached_pictures(AVFormatContext *s)
{
int i;
for (i = 0; i < s->nb_streams; i++)
- if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC) {
+ if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC &&
+ s->streams[i]->discard < AVDISCARD_ALL) {
AVPacket copy = s->streams[i]->attached_pic;
copy.destruct = NULL;
add_to_pktbuf(&s->raw_packet_buffer, &copy, &s->raw_packet_buffer_end);