From: John Koleszar <jkoleszar@google.com>
Date: Fri, 11 May 2012 17:51:05 +0000 (-0700)
Subject: Merge branch 'origin/eider' into master
X-Git-Tag: v1.2.0~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44d35f7b257cc3e737a38eb9537d57c3e0479885;p=libvpx

Merge branch 'origin/eider' into master

Conflicts:
	vp8/common/entropymode.c
	vp8/common/entropymode.h
	vp8/encoder/encodeframe.c
	vp8/vp8_cx_iface.c

Change-Id: I708b0f30449b9502b382e47b745d56f5ed2ce265
---

44d35f7b257cc3e737a38eb9537d57c3e0479885
diff --cc configure
index 3fbc67e4b,62e1ffbcf..2b1328dbd
--- a/configure
+++ b/configure
@@@ -513,6 -528,10 +528,10 @@@ process_toolchain() 
          check_add_cflags -Wpointer-arith
          check_add_cflags -Wtype-limits
          check_add_cflags -Wcast-qual
+         check_add_cflags -Wimplicit-function-declaration
+         check_add_cflags -Wuninitialized
+         check_add_cflags -Wunused-variable
 -        check_add_cflags -Wunused-but-set-variable        
++        check_add_cflags -Wunused-but-set-variable
          enabled extra_warnings || check_add_cflags -Wno-unused-function
      fi
  
diff --cc vp8/common/entropymode.c
index 0f7f00cd6,de7e82835..091e4c732
--- a/vp8/common/entropymode.c
+++ b/vp8/common/entropymode.c
@@@ -169,4 -171,7 +169,3 @@@ void vp8_default_bmode_probs(vp8_prob 
      vpx_memcpy(p, vp8_bmode_prob, sizeof(vp8_bmode_prob));
  }
  
- 
 -void vp8_kf_default_bmode_probs(vp8_prob p [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1])
 -{
 -    vpx_memcpy(p, vp8_kf_bmode_prob, sizeof(vp8_kf_bmode_prob));
 -}
diff --cc vp8/common/entropymode.h
index aa5c600f6,70200cb5f..3a2fa84cc
--- a/vp8/common/entropymode.h
+++ b/vp8/common/entropymode.h
@@@ -67,15 -67,9 +67,14 @@@ extern const vp8_tree_index vp8_small_m
  
  extern const struct vp8_token_struct vp8_small_mvencodings[8];
  
 -void vp8_init_mbmode_probs(VP8_COMMON *x);
 +/* Key frame default mode probs */
 +extern const vp8_prob vp8_kf_bmode_prob[VP8_BINTRAMODES][VP8_BINTRAMODES]
 +[VP8_BINTRAMODES-1];
 +extern const vp8_prob vp8_kf_uv_mode_prob[VP8_UV_MODES-1];
 +extern const vp8_prob vp8_kf_ymode_prob[VP8_YMODES-1];
  
- 
 -void   vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES-1]);
 +void vp8_init_mbmode_probs(VP8_COMMON *x);
 +void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES-1]);
  void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1]);
  
  #endif
diff --cc vp8/vp8_cx_iface.c
index f55a4205f,5fb74c45e..920c7632c
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -755,6 -730,6 +730,9 @@@ static vpx_codec_err_t vp8e_encode(vpx_
  {
      vpx_codec_err_t res = VPX_CODEC_OK;
  
++    if (!ctx->cfg.rc_target_bitrate)
++        return res;
++
      if (!ctx->cfg.rc_target_bitrate)
          return res;