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

Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47' 

* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
  flvenc: Don't over-count metadata.

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/vsynth/vsynth1-flashsv
	tests/ref/vsynth/vsynth1-flv
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-18 01:44:24 +02:00
parent 9f028b3f3a 74bc945805
commit 3f2f87cd5a
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/flvenc.c
View File

@ -304,7 +304,7 @@ static int flv_write_header(AVFormatContext *s)
/* mixed array (hash) with size and string/type/data tuples */ /* mixed array (hash) with size and string/type/data tuples */
avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY); avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
metadata_count_pos = avio_tell(pb); metadata_count_pos = avio_tell(pb);
metadata_count = 5 * !!video_enc + metadata_count = 4 * !!video_enc +
5 * !!audio_enc + 5 * !!audio_enc +
1 * !!data_enc + 1 * !!data_enc +
2; // +2 for duration and file size 2; // +2 for duration and file size
@ -330,6 +330,7 @@ static int flv_write_header(AVFormatContext *s)
if (framerate != 0.0) { if (framerate != 0.0) {
put_amf_string(pb, "framerate"); put_amf_string(pb, "framerate");
put_amf_double(pb, framerate); put_amf_double(pb, framerate);
metadata_count++;
} }
put_amf_string(pb, "videocodecid"); put_amf_string(pb, "videocodecid");