diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 11:43:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 11:44:02 +0200 |
| commit | 22f79a2d605f3c3b36bb05e9609ff3a3dc27d1f9 (patch) | |
| tree | df8816f0e4209a77e6c366037257448375737d61 | |
| parent | a275ff7e010a7fd5899014353996ef3154f3341d (diff) | |
| parent | 0a9425d7cfdf0113c3d32096c9406823efe0cd0a (diff) | |
| download | ffmpeg-22f79a2d605f3c3b36bb05e9609ff3a3dc27d1f9.tar.gz | |
Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'
* commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a':
flv: Do not export datastream as metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 6b0d2dfc16..9a5ca872b1 100644 --- 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) { |