avidec: Let the inner dv demuxer take care of discarding

CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato 2013-07-27 15:48:41 +02:00
parent 10aa44aa67
commit c8f0b20b4a
1 changed files with 6 additions and 3 deletions

View File

@ -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);
}