virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

wavenc: write fact chunk sample count at the correct file position

Browse Source 
Fixes curruption of metadata in the INFO chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:
Michael Niedermayer
2012-10-30 21:48:39 +01:00
committed by Justin Ruggles
parent 259d8c5647
commit 2fe0094e0b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/wavenc.c
View File

@@ -36,6 +36,7 @@
typedef struct WAVMuxContext { typedef struct WAVMuxContext {
const AVClass *class; const AVClass *class;
int64_t data; int64_t data;
int64_t fact_pos;
int64_t minpts; int64_t minpts;
int64_t maxpts; int64_t maxpts;
int last_duration; int last_duration;
@@ -100,7 +101,7 @@ static int wav_write_header(AVFormatContext *s)
{ {
WAVMuxContext *wav = s->priv_data; WAVMuxContext *wav = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int64_t fmt, fact; int64_t fmt;
ffio_wfourcc(pb, "RIFF"); ffio_wfourcc(pb, "RIFF");
avio_wl32(pb, 0); /* file length */ avio_wl32(pb, 0); /* file length */
@@ -117,9 +118,9 @@ static int wav_write_header(AVFormatContext *s)
if (s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */ if (s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */
&& s->pb->seekable) { && s->pb->seekable) {
fact = ff_start_tag(pb, "fact"); wav->fact_pos = ff_start_tag(pb, "fact");
avio_wl32(pb, 0); avio_wl32(pb, 0);
ff_end_tag(pb, fact); ff_end_tag(pb, wav->fact_pos);
} }
if (wav->write_bext) if (wav->write_bext)
@@ -179,7 +180,7 @@ static int wav_write_trailer(AVFormatContext *s)
number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration, number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration,
s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num, s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num,
s->streams[0]->time_base.den); s->streams[0]->time_base.den);
avio_seek(pb, wav->data-12, SEEK_SET); avio_seek(pb, wav->fact_pos, SEEK_SET);
avio_wl32(pb, number_of_samples); avio_wl32(pb, number_of_samples);
avio_seek(pb, file_size, SEEK_SET); avio_seek(pb, file_size, SEEK_SET);
avio_flush(pb); avio_flush(pb);