Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:45:25 +0000 (11:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:45:25 +0000 (11:45 +0100)
commitf03cdbd0454fbdba53a123a8f95186a519fade8d
treec7386c765f42c684b931dcefb6382d4aadf43e5a
parentd13f434dbb55348b3ed761e4f4c2ff9c7be4ea4b
parent5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20
Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20'

* commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20':
  binkaudio: decode directly to the user-provided AVFrame
  atrac3: decode directly to the user-provided AVFrame
  atrac1: decode directly to the user-provided AVFrame
  ape: decode directly to the user-provided AVFrame
  amrwb: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/amrwbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/amrwbdec.c
libavcodec/apedec.c
libavcodec/atrac1.c
libavcodec/atrac3.c
libavcodec/binkaudio.c