Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 13:24:14 +0000 (14:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 13:24:19 +0000 (14:24 +0100)
commita13148f63351db5f8283a23de9a22e940d29d8cd
tree7a9a10399626bebfc3f63f6b30087f06ae178e2f
parent86270236d5ef97263858a576fab2c366fb2aa76a
parent8e134e5104e99a69cd4cea10540a7ce9c3682a2c
Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'

* commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c':
  lavc: clarify get_buffer() documentation
  mpegaudiodec: use planar sample format for output unless packed is requested
  x86: h264 qpel: use the correct number of utilized xmm regs in cglobal

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodec_float.c
libavcodec/x86/h264_qpel_8bit.asm