[SCM] libav/experimental: flv: Index the audio stream
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:04:07 UTC 2014
The following commit has been merged in the experimental branch:
commit fa14804c83a7108a50c63d1f2180e30c75909529
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Fri Aug 1 03:03:20 2014 +0200
flv: Index the audio stream
And leverage the video index if the video is just disabled as wm4
did in an initial patch.
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 8e4cc5e..034e346 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -818,6 +818,11 @@ skip:
st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO
: AVMEDIA_TYPE_VIDEO);
av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard);
+
+ if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||
+ is_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 || is_audio)) ||
(st->discard >= AVDISCARD_BIDIR &&
@@ -826,8 +831,6 @@ skip:
avio_seek(s->pb, next, SEEK_SET);
continue;
}
- if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
- av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
break;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list