Merge commit 'c8f0b20b'

* commit 'c8f0b20b':
  avidec: Let the inner dv demuxer take care of discarding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/avidec.c

@@ -1084,9 +1084,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);
                     avio_skip(pb, size);