Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Aug 2011 14:29:46 +0000 (16:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Aug 2011 14:29:51 +0000 (16:29 +0200)
commita9aa88df1d8bdef7a3ba520e285c6c5b639d5fd5
treead58a7f68309b31b07d54564879e4f60ffdeac88
parente2cc3311246376e902f0defc6c57bd554babcf39
parent7221139ba0486c24afeac1f41ba97c75f58046b9
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>
libavcodec/aacdec.c
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264_refs.c
libavcodec/utils.c
libavcodec/version.h