← Back to branch summary

~ubuntu-branches/ubuntu/raring/libav/raring-security

« back to all changes in this revision

Viewing changes to debian/patches/post-0.7.1/0031-flvenc-use-int64_t-to-store-offsets.patch

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-10-01 00:22:07 UTC
  • mfrom: (1.3.8 sid)
  • Revision ID: package-import@ubuntu.com-20111001002207-tnxz39i0rwr5ufy9
Tags: 4:0.7.2-1ubuntu1
* Merge from debian, remaining changes:
  - don't build against libfaad, libdirac, librtmp and libopenjpeg,
    lame, xvid, x264  (all in universe)
  - not installing into multiarch directories
* This new upstream release has basically merged in all 70 patches that
  are present in 4:0.7.1-7ubuntu2, plus some additional, similarily
  focused ones.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/post-0.7.1/0031-flvenc-use-int64_t-to-store-offsets.patch
1
 
From fe3e7297fe56a383baca484dea2c0d603ae305f8 Mon Sep 17 00:00:00 2001
2
 
From: Luca Barbato <lu_zero@gentoo.org>
3
 
Date: Wed, 8 Jun 2011 14:32:07 +0000
4
 
Subject: [PATCH 31/70] flvenc: use int64_t to store offsets
5
 
 
6
 
Metadata currently is written only at the start of the file in normal
7
 
cases, when transcoding from a rtmp source metadata could be
8
 
written later and the offset recorded can exceed 32bit.
9
 
 
10
 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11
 
(cherry picked from commit 7f5bf4fbaf1f2142547321a16358f9871fabdcc6)
12
 
 
13
 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14
 
---
15
 
 libavformat/flvenc.c |    2 +-
16
 
 1 files changed, 1 insertions(+), 1 deletions(-)
17
 
 
18
 
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
19
 
index 487993c..bd1a1f4 100644
20
 
--- a/libavformat/flvenc.c
21
 
+++ b/libavformat/flvenc.c
22
 
@@ -177,7 +177,7 @@ static int flv_write_header(AVFormatContext *s)
23
 
     AVCodecContext *audio_enc = NULL, *video_enc = NULL;
24
 
     int i;
25
 
     double framerate = 0.0;
26
 
-    int metadata_size_pos, data_size;
27
 
+    int64_t metadata_size_pos, data_size;
28
 
     AVDictionaryEntry *tag = NULL;
29
 
 
30
 
     for(i=0; i<s->nb_streams; i++){
31
 
1.7.4.1
32