Module: libav Branch: master Commit: bafff1668c6bc4d1cb3b7e4b9dac85b8b52e4765
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Wed Sep 21 16:51:13 2011 +0300 flvdec: Ignore the index if it's from a creator known to be different Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/flvdec.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index cafbeb5..569d734 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -140,6 +140,18 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, AVStream int64_t *filepositions = NULL; int ret = AVERROR(ENOSYS); int64_t initial_pos = avio_tell(ioc); + AVDictionaryEntry *creator = av_dict_get(s->metadata, "metadatacreator", + NULL, 0); + + if (creator && !strcmp(creator->value, "MEGA")) { + /* Files with this metadatacreator tag seem to have filepositions + * pointing at the 4 trailer bytes of the previous packet, + * which isn't the norm (nor what we expect here, nor what + * jwplayer + lighttpd expect, nor what flvtool2 produces). + * Just ignore the index in this case, instead of risking trying + * to adjust it to something that might or might not work. */ + return 0; + } while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { int64_t* current_array; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
