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:00:11 +0200 |
| commit | c8f0b20b4a6bb6691928789d83e4b02896969848 (patch) | |
| tree | 3490d37ced10cfd1f3f0ec69cda87a9b586ffba5 | |
| parent | 10aa44aa675e05067845e3e55fac37642cbbdae4 (diff) | |
| download | ffmpeg-c8f0b20b4a6bb6691928789d83e4b02896969848.tar.gz | |
avidec: Let the inner dv demuxer take care of discarding
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 85a9973319..26deb31ec2 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -984,9 +984,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); } |