Shut up clang -Wuninitialized warning

diff --git a/common/osdep.h b/common/osdep.h
index 52e445a65d0772e72f5c215db16272db27bca1ec..17806235f44db72ee2353fcdbff4bdee90390f5a 100644 (file)
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -142,8 +142,6 @@ int x264_is_pipe( const char *path );
 #define ALIGNED_ARRAY_N ALIGNED_ARRAY_16
 #endif
 
-#define UNINIT(x) x=x
-
 #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
 #define UNUSED __attribute__((unused))
 #define ALWAYS_INLINE __attribute__((always_inline)) inline

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 86aad96b5fbc635339e82a234bdb7559e8ad0a2c..3e92e38c12b76717a54dbb2b1c9d50499cd0a164 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -2335,7 +2335,7 @@ static float rate_estimate_qscale( x264_t *h )
 {
     float q;
     x264_ratecontrol_t *rcc = h->rc;
-    ratecontrol_entry_t UNINIT(rce);
+    ratecontrol_entry_t rce = {0};
     int pict_type = h->sh.i_type;
     int64_t total_bits = 8*(h->stat.i_frame_size[SLICE_TYPE_I]
                           + h->stat.i_frame_size[SLICE_TYPE_P]