Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:29:31 +0000 (12:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:29:31 +0000 (12:29 +0100)
commit4b7c81c3e059ae08e4aa74222de1762342ef8abf
tree86f804f2006b9c32d01d291bb2a20ff3fe56d542
parent2220f13d8227bf769aec3a699b34b1025f976c8e
parent870a0c669e536d56c6325d84f65e34c53792398e
Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'

* commit '870a0c669e536d56c6325d84f65e34c53792398e':
  build: The libopencore-amrnb encoder depends on audio_frame_queue

Conflicts:
libavcodec/Makefile

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