[FFmpeg-soc] [soc]: r3781 - in dirac/libavcodec: dirac.c dirac.h

conrad subversion at mplayerhq.hu
Mon Nov 10 04:11:33 CET 2008


Author: conrad
Date: Mon Nov 10 04:11:32 2008
New Revision: 3781

Log:
Don't specify the size of constant tables


Modified:
   dirac/libavcodec/dirac.c
   dirac/libavcodec/dirac.h

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Mon Nov 10 04:11:32 2008
@@ -92,21 +92,21 @@ const color_specification ff_dirac_color
     { COLOR_PRIMARY_HDTV,     COLOR_MATRIX_HDTV, TRANSFER_FUNC_TV },
     { COLOR_PRIMARY_HDTV,     COLOR_MATRIX_HDTV, TRANSFER_FUNC_DCI_GAMMA },
 };
-const float dirac_preset_kr[3] = { 0.2126, 0.299, 0 /* XXX */ };
-const float dirac_preset_kb[3] = { 0.0722, 0.114, 0 /* XXX */ };
+const float dirac_preset_kr[] = { 0.2126, 0.299, 0 /* XXX */ };
+const float dirac_preset_kb[] = { 0.0722, 0.114, 0 /* XXX */ };
 
 /* Weights for qpel/eighth pel interpolation.  */
 typedef uint8_t weights_t[4];
 
 /* Quarter pixel interpolation.  */
-const weights_t qpel_weights[4] = {
+const weights_t qpel_weights[] = {
     {  4,  0,  0,  0 }, /* rx=0, ry=0 */
     {  2,  0,  2,  0 }, /* rx=0, ry=1 */
     {  2,  2,  0,  0 }, /* rx=1, ry=0 */
     {  1,  1,  1,  1 }, /* rx=1, ry=1 */
 };
 
-const weights_t eighthpel_weights[16] = {
+const weights_t eighthpel_weights[] = {
     { 16,  0,  0,  0 }, /* rx=0, ry=0 */
     { 12,  0,  4,  0 }, /* rx=0, ry=1 */
     {  8,  0,  8,  0 }, /* rx=0, ry=2 */
@@ -196,7 +196,7 @@ struct dirac_arith_context_set dirac_con
         .sign = ARITH_CONTEXT_DC_SIGN
     };
 
-struct dirac_arith_context_set dirac_context_sets_waveletcoeff[12] = {
+struct dirac_arith_context_set dirac_context_sets_waveletcoeff[] = {
     {
         /* Parent = 0, Zero neighbourhood, sign predict 0 */
         .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2,

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Mon Nov 10 04:11:32 2008
@@ -148,13 +148,13 @@ extern const uint16_t dirac_preset_luma_
 extern const uint16_t dirac_preset_chroma_offset[];
 extern const uint16_t dirac_preset_chroma_excursion[];
 extern const color_specification ff_dirac_color_spec_presets[];
-extern const float dirac_preset_kr[3];
-extern const float dirac_preset_kb[3];
+extern const float dirac_preset_kr[];
+extern const float dirac_preset_kb[];
 
 extern struct dirac_arith_context_set dirac_context_set_split;
 extern struct dirac_arith_context_set dirac_context_set_mv;
 extern struct dirac_arith_context_set dirac_context_set_dc;
-extern struct dirac_arith_context_set dirac_context_sets_waveletcoeff[12];
+extern struct dirac_arith_context_set dirac_context_sets_waveletcoeff[];
 
 typedef int16_t vect_t[2];
 



More information about the FFmpeg-soc mailing list