[FFmpeg-cvslog] Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 12:21:00 2013 +0100| [65da7007043cf4fb99b72c7f823cfc15e429b45f] | committer: Michael Niedermayer

Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'

* commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8':
  qcelp: decode directly to the user-provided AVFrame
  pcm-bluray: decode directly to the user-provided AVFrame
  nellymoser: decode directly to the user-provided AVFrame
  mpc7/8: decode directly to the user-provided AVFrame
  mpegaudio: decode directly to the user-provided AVFrame
  mlp/truehd: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/mpc7.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65da7007043cf4fb99b72c7f823cfc15e429b45f
---