diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-27 15:48:41 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-27 16:32:32 +0200 |
| commit | c2c9b7297fe6ee95788c27728b0073e38e33b94d (patch) | |
| tree | 3aa433c32efbd62d81b27d02ffddd588e2de7305 | |
| parent | 9aaca159bd220582c698f13d081a455f398c9975 (diff) | |
| download | ffmpeg-c2c9b7297fe6ee95788c27728b0073e38e33b94d.tar.gz | |
avidec: Let the inner dv demuxer take care of discarding
(cherry picked from commit c8f0b20b4a6bb6691928789d83e4b)
CC: libav-stable@libav.org
| -rw-r--r-- | libavformat/avidec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index a3af5cf2de..ee341c21b6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -920,9 +920,12 @@ start_sync: } - if( (st->discard >= AVDISCARD_DEFAULT && size==0) - /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/ //FIXME needs a little reordering - || st->discard >= AVDISCARD_ALL){ + if (!avi->dv_demux && + ((st->discard >= AVDISCARD_DEFAULT && size==0) /* || + //FIXME needs a little reordering + (st->discard >= AVDISCARD_NONKEY && + !(pkt->flags & AV_PKT_FLAG_KEY)) */ + || st->discard >= AVDISCARD_ALL)) { if (!exit_early) { ast->frame_offset += get_duration(ast, size); } |