Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:21:00 +0000 (12:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:22:35 +0000 (12:22 +0100)
commit65da7007043cf4fb99b72c7f823cfc15e429b45f
treebaf5a652e66f919f462cc80c6d8fe0d247788475
parentafe30fe0600824b0dcda8318f09a5a4e376b99c3
parent1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8
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@gmx.at>
libavcodec/mlpdec.c
libavcodec/mpc.h
libavcodec/mpc7.c
libavcodec/mpc8.c
libavcodec/mpegaudiodec.c
libavcodec/nellymoserdec.c
libavcodec/pcm-mpeg.c
libavcodec/qcelpdec.c