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

[Luca Barbato]

ffmpeg | branch: release/1.2 | Luca Barbato <lu_zero at gentoo.org> | Sat Jul 27 15:48:41 2013 +0200| [78197501572abbad33d7458f5009c5f53ecf021a] | committer: Carl Eugen Hoyos

avidec: Let the inner dv demuxer take care of discarding

Fixes ticket #1796.
(cherry picked from commit c8f0b20b4a6bb6691928789d83e4b02896969848)

Conflicts:
	libavformat/avidec.c

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index d2f0152..6bd6446 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1002,10 +1002,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);