Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: make avcodec_init() static on next bump.
  ac3enc: remove unneeded #include
  ac3enc: restructure coupling coordinate reuse calculation
  ac3enc: allow new coupling coordinates to be sent independently for each channel.
  ac3enc: separate exponent bit counting from exponent grouping.
  h264: propagate error return values for AV_LOG_ERROR-triggering events
  aac: Don't attempt to output configure an invalid channel configuration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/aacdec.c
Simple merge

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/ac3enc.h
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavcodec/h264_refs.c
Simple merge

diff --cc libavcodec/utils.c
index e7ccac2,64f623c..6175d83
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -1141,9 -1062,12 +1141,12 @@@ const char *avcodec_configuration(void
  const char *avcodec_license(void)
  {
  #define LICENSE_PREFIX "libavcodec license: "
 -    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 +    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
  }
  
+ #if !FF_API_AVCODEC_INIT
+ static
+ #endif
  void avcodec_init(void)
  {
      static int initialized = 0;

diff --cc libavcodec/version.h
Simple merge