[SCM] libav/experimental: mpegts: change variable-length array to fixed length

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:50:22 UTC 2013


The following commit has been merged in the experimental branch:
commit cf5ec607406cf6e1b2dd28247fd5026457c747c1
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Aug 24 21:42:25 2009 +0000

    mpegts: change variable-length array to fixed length
    
    The difference between 188 and 204 is not worth worrying about.
    
    Originally committed as revision 19697 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index e3bdc6b..01845ed 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -356,7 +356,7 @@ static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
 }
 
 static int analyze(const uint8_t *buf, int size, int packet_size, int *index){
-    int stat[packet_size];
+    int stat[TS_MAX_PACKET_SIZE];
     int i;
     int x=0;
     int best_score=0;
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index e5df071..7c4e73c 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -27,6 +27,8 @@
 #define TS_FEC_PACKET_SIZE 204
 #define TS_DVHS_PACKET_SIZE 192
 #define TS_PACKET_SIZE 188
+#define TS_MAX_PACKET_SIZE 204
+
 #define NB_PID_MAX 8192
 #define MAX_SECTION_SIZE 4096
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list