Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:53:23 +0000 (11:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:53:23 +0000 (11:53 +0100)
commit0a5138695aa441ab341b2f00d946c239db69edbf
tree900049ab4690d9511ae2ccad787e0000694529cb
parentf03cdbd0454fbdba53a123a8f95186a519fade8d
parent182821cff43f5f977004d105b86c47ceb20d00d6
Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6'

* commit '182821cff43f5f977004d105b86c47ceb20d00d6':
  dca: decode directly to the user-provided AVFrame
  cook: decode directly to the user-provided AVFrame
  comfortnoise: decode directly to the user-provided AVFrame
  bmvaudio: decode directly to the user-provided AVFrame
  pcm: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bmv.c
libavcodec/cngdec.c
libavcodec/cook.c
libavcodec/dcadec.c
libavcodec/pcm.c