[FFmpeg-cvslog] flvenc: use int64_t to store offsets

Luca Barbato git at videolan.org
Sun Dec 25 01:35:58 CET 2011


ffmpeg | branch: release/0.6 | Luca Barbato <lu_zero at gentoo.org> | Wed Jun  8 14:32:07 2011 +0000| [973bdafe05d051b6e83467c0c4ef548d2ea9a901] | committer: Reinhard Tartler

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 at khirnov.net>
(cherry picked from commit 7f5bf4fbaf1f2142547321a16358f9871fabdcc6)

Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit fe3e7297fe56a383baca484dea2c0d603ae305f8)

Conflicts:

	libavformat/flvenc.c

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=973bdafe05d051b6e83467c0c4ef548d2ea9a901
---

 libavformat/flvenc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index c351117..fa6a1d1 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;



More information about the ffmpeg-cvslog mailing list