Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 00:19:31 +0000 (01:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 00:19:31 +0000 (01:19 +0100)
commit0f5a0a415510c78d9d047e100929f32e68324cd3
tree3b7e2860d8908780eb7745aa367de3579b625458
parent7acfa7758c7f655119a7cf972b9c4cc74de75161
parentd61c6ebccfde3797a5d376e0f203550d7beb0576
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  svq3: unbreak decoding
  build: make audio_frame_queue a stand-alone component
  build: The libopencore-amrnb encoder depends on audio_frame_queue
  libopencore-amrwb: Make AMR-WB ifdeffery more precise
  libopencore-amr: Conditionally compile decoder and encoder bits
  libopencore-amrnb: cosmetics: Group all encoder-related code together

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/libopencore-amr.c