[FFmpeg-cvslog] avidec: Let the inner dv demuxer take care of discarding

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Jul 27 15:48:41 2013 +0200| [c8f0b20b4a6bb6691928789d83e4b02896969848] | committer: Luca Barbato

avidec: Let the inner dv demuxer take care of discarding

CC: libav-stable at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8f0b20b4a6bb6691928789d83e4b02896969848
---

 libavformat/avidec.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 85a9973..26deb31 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);
                 }