[x264-devel] [Git][videolan/x264][master] Fix gcc warnings

Anton Mitrofanov (@BugMaster) gitlab at videolan.org
Wed Sep 29 21:20:39 UTC 2021



Anton Mitrofanov pushed to branch master at VideoLAN / x264


Commits:
93fe0a1f by Anton Mitrofanov at 2021-09-29T21:15:38+00:00
Fix gcc warnings

- - - - -


4 changed files:

- common/deblock.c
- common/macroblock.h
- common/mvpred.c
- encoder/set.c


Changes:

=====================================
common/deblock.c
=====================================
@@ -655,11 +655,11 @@ void x264_macroblock_deblock( x264_t *h )
     } while( 0 )
 
     if( !transform_8x8 ) FILTER( 0, 1 );
-                         FILTER( 0, 2 );
+    FILTER( 0, 2 );
     if( !transform_8x8 ) FILTER( 0, 3 );
 
     if( !transform_8x8 ) FILTER( 1, 1 );
-                         FILTER( 1, 2 );
+    FILTER( 1, 2 );
     if( !transform_8x8 ) FILTER( 1, 3 );
 
     #undef FILTER


=====================================
common/macroblock.h
=====================================
@@ -361,7 +361,7 @@ int x264_mb_predict_mv_direct16x16( x264_t *h, int *b_changed );
  *      uses all neighbors, even those that didn't end up using this ref.
  *      h->mb. need only valid values from other blocks */
 #define x264_mb_predict_mv_ref16x16 x264_template(mb_predict_mv_ref16x16)
-void x264_mb_predict_mv_ref16x16( x264_t *h, int i_list, int i_ref, int16_t mvc[8][2], int *i_mvc );
+void x264_mb_predict_mv_ref16x16( x264_t *h, int i_list, int i_ref, int16_t (*mvc)[2], int *i_mvc );
 
 #define x264_mb_mc x264_template(mb_mc)
 void x264_mb_mc( x264_t *h );


=====================================
common/mvpred.c
=====================================
@@ -516,7 +516,7 @@ int x264_mb_predict_mv_direct16x16( x264_t *h, int *b_changed )
 }
 
 /* This just improves encoder performance, it's not part of the spec */
-void x264_mb_predict_mv_ref16x16( x264_t *h, int i_list, int i_ref, int16_t mvc[9][2], int *i_mvc )
+void x264_mb_predict_mv_ref16x16( x264_t *h, int i_list, int i_ref, int16_t (*mvc)[2], int *i_mvc )
 {
     int16_t (*mvr)[2] = h->mb.mvr[i_list][i_ref];
     int i = 0;


=====================================
encoder/set.c
=====================================
@@ -865,6 +865,7 @@ int x264_sei_avcintra_vanc_write( x264_t *h, bs_t *s, int len )
     return 0;
 }
 
+#undef ERROR
 #define ERROR(...)\
 {\
     if( verbose )\



View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/93fe0a1f2372140f1925a1af5b734151c21f992d

-- 
View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/93fe0a1f2372140f1925a1af5b734151c21f992d
You're receiving this email because of your account on code.videolan.org.




More information about the x264-devel mailing list