eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

avidec: Let the inner dv demuxer take care of discarding

Browse Source 
(cherry picked from commit c8f0b20b4a)

CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato
2013-07-27 15:48:41 +02:00
parent e786cc3331
commit c69b4bdf58
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/avidec.c
+6 -3
View File
@@ -917,9 +917,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);
}