RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a' 

* commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a':
  flv: Do not export datastream as metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-17 11:43:58 +02:00
parent a275ff7e01 0a9425d7cf
commit 22f79a2d60
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/flvdec.c
View File

@ -504,7 +504,8 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
!strcmp(key, "audiosamplerate") || !strcmp(key, "audiosamplerate") ||
!strcmp(key, "audiosamplesize") || !strcmp(key, "audiosamplesize") ||
!strcmp(key, "stereo") || !strcmp(key, "stereo") ||
!strcmp(key, "audiocodecid")) !strcmp(key, "audiocodecid") ||
!strcmp(key, "datastream"))
return 0; return 0;
if (amf_type == AMF_DATA_TYPE_BOOL) { if (amf_type == AMF_DATA_TYPE_BOOL) {