[FFmpeg-cvslog] r23000 - trunk/libavcodec/aacsbr.c

alexc subversion
Sat May 1 01:32:42 CEST 2010


Author: alexc
Date: Sat May  1 01:32:42 2010
New Revision: 23000

Log:
Enforce time border monotonicity.

Thanks to Chromium.

Modified:
   trunk/libavcodec/aacsbr.c

Modified: trunk/libavcodec/aacsbr.c
==============================================================================
--- trunk/libavcodec/aacsbr.c	Sat May  1 01:08:44 2010	(r22999)
+++ trunk/libavcodec/aacsbr.c	Sat May  1 01:32:42 2010	(r23000)
@@ -720,6 +720,13 @@ static int read_sbr_grid(AACContext *ac,
         return -1;
     }
 
+    for (i = 1; i <= ch_data->bs_num_env; i++) {
+        if (ch_data->t_env[i-1] > ch_data->t_env[i]) {
+            av_log(ac->avccontext, AV_LOG_ERROR, "Non monotone time borders\n");
+            return -1;
+        }
+    }
+
     ch_data->bs_num_noise = (ch_data->bs_num_env > 1) + 1;
 
     ch_data->t_q[0]                     = ch_data->t_env[0];



More information about the ffmpeg-cvslog mailing list