[FFmpeg-cvslog] flvdec: Remove the now redundant check for known broken metadata creator

Michael Niedermayer git at videolan.org
Tue Feb 28 03:53:26 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 29 23:23:34 2011 +0100| [e60bdb7e5ce55505599fe13238ae54d98c2cc0f7] | committer: Martin Storsjö

flvdec: Remove the now redundant check for known broken metadata creator

The index validation identifies these indexes as broken.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e60bdb7e5ce55505599fe13238ae54d98c2cc0f7
---

 libavformat/flvdec.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index d2b09b2..55ac9da 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -153,18 +153,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 (s->flags & AVFMT_FLAG_IGNIDX)
         return 0;



More information about the ffmpeg-cvslog mailing list