aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2011-06-08 14:32:07 +0000
committerReinhard Tartler <siretart@tauware.de>2011-12-24 12:20:32 +0100
commit973bdafe05d051b6e83467c0c4ef548d2ea9a901 (patch)
treee55f020ebfe7783c3795c9204b363b4d6e296f00
parentf4a5a730d8e091534ab58f6b2557374b913815ab (diff)
downloadffmpeg-973bdafe05d051b6e83467c0c4ef548d2ea9a901.tar.gz
flvenc: use int64_t to store offsets
Metadata currently is written only at the start of the file in normal cases, when transcoding from a rtmp source metadata could be written later and the offset recorded can exceed 32bit. Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 7f5bf4fbaf1f2142547321a16358f9871fabdcc6) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit fe3e7297fe56a383baca484dea2c0d603ae305f8) Conflicts: libavformat/flvenc.c Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavformat/flvenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index c351117132..fa6a1d13d0 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -162,7 +162,7 @@ static int flv_write_header(AVFormatContext *s)
AVCodecContext *audio_enc = NULL, *video_enc = NULL;
int i;
double framerate = 0.0;
- int metadata_size_pos, data_size;
+ int64_t metadata_size_pos, data_size;
for(i=0; i<s->nb_streams; i++){
AVCodecContext *enc = s->streams[i]->codec;