generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avidec: Let the inner dv demuxer take care of discarding

Browse Source 
Fixes ticket #1796.
(cherry picked from commit c8f0b20b4a)

Conflicts:
	libavformat/avidec.c
This commit is contained in:
Luca Barbato
2013-07-27 15:48:41 +02:00
committed by Carl Eugen Hoyos
parent e63346f7e8
commit 7819750157
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avidec.c
View File

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