aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-29 23:23:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-30 04:29:55 +0100
commit67c734ea5c3bcba7fca35dcff223ca0388eb8b4b (patch)
tree9ab49afde2f8349a7b5a58eba8f4dcaf8fc71a7e
parentdf0bff6643cadbd9c07bbe2b0536a7c9d0dfe0c6 (diff)
downloadffmpeg-67c734ea5c3bcba7fca35dcff223ca0388eb8b4b.tar.gz
flvdec: Disable metadatacreator "MEGA" hack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/flvdec.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 2e5032095e..203ea9f255 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -143,18 +143,6 @@ 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;
- }
if(vstream->nb_index_entries>0){
av_log(s, AV_LOG_WARNING, "Skiping duplicate index\n");