diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 21:34:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 21:34:31 +0200 |
| commit | afd62b3f184569492230e7f34ad55581c6b2d2c3 (patch) | |
| tree | 8735bd33eb54b8f60f9e6921ca9cce12fa015a90 | |
| parent | f95298c913899207344d668a6d5624cb2d2e480c (diff) | |
| parent | fa14804c83a7108a50c63d1f2180e30c75909529 (diff) | |
| download | ffmpeg-afd62b3f184569492230e7f34ad55581c6b2d2c3.tar.gz | |
Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'
* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
flv: Index the audio stream
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvdec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index a97fc32a20..72833de0fd 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -862,6 +862,11 @@ skip: } av_dlog(s, "%d %X %d \n", stream_type, flags, st->discard); + + if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || + stream_type == FLV_STREAM_TYPE_AUDIO) + av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); + if ( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || (stream_type == FLV_STREAM_TYPE_AUDIO))) ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && (stream_type == FLV_STREAM_TYPE_VIDEO))) || st->discard >= AVDISCARD_ALL @@ -869,8 +874,6 @@ skip: avio_seek(s->pb, next, SEEK_SET); continue; } - if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || stream_type == FLV_STREAM_TYPE_AUDIO) - av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); break; } |