virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'

Browse Source 
* commit 'c8f0b20b4a6bb6691928789d83e4b02896969848':
  avidec: Let the inner dv demuxer take care of discarding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-28 13:13:47 +02:00
parent d781220991 c8f0b20b4a
commit 3afcddcff2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/avidec.c
View File

@@ -1084,9 +1084,12 @@ start_sync:
} }
} }
if ((st->discard >= AVDISCARD_DEFAULT && size == 0) if (!avi->dv_demux &&
/* || (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY)) */ // FIXME: needs a little reordering ((st->discard >= AVDISCARD_DEFAULT && size == 0) /* ||
|| st->discard >= AVDISCARD_ALL) { // FIXME: needs a little reordering
(st->discard >= AVDISCARD_NONKEY &&
!(pkt->flags & AV_PKT_FLAG_KEY)) */
|| st->discard >= AVDISCARD_ALL)) {
if (!exit_early) { if (!exit_early) {
ast->frame_offset += get_duration(ast, size); ast->frame_offset += get_duration(ast, size);
avio_skip(pb, size); avio_skip(pb, size);