Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'

* commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a': flv: Do not export datastream as metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 22f79a2d60
parent a275ff7e01 0a9425d7cf
commit 22f79a2d60
1 changed files with 2 additions and 1 deletions
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@ -504,7 +504,8 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
            !strcmp(key, "audiosamplerate") ||
            !strcmp(key, "audiosamplesize") ||
            !strcmp(key, "stereo")          ||
-            !strcmp(key, "audiocodecid"))
+            !strcmp(key, "audiocodecid")    ||
+            !strcmp(key, "datastream"))
            return 0;

        if (amf_type == AMF_DATA_TYPE_BOOL) {