Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:59:51 +0000 (11:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:59:51 +0000 (11:59 +0100)
commitd88e674a15dc23ca6bb68173dbb7c12e5d668bb5
tree0a7d58e61ea7e3e3e692731f7a4e1e119f197689
parent0a5138695aa441ab341b2f00d946c239db69edbf
parentcb7b47a61dba0b9329ecede5dd3211dc0662dc05
Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05'

* commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05':
  g726: decode directly to the user-provided AVFrame
  g723.1: decode directly to the user-provided AVFrame
  g722: decode directly to the user-provided AVFrame
  flac: decode directly to the user-provided AVFrame
  cinaudio: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/g723_1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsicinav.c
libavcodec/flacdec.c
libavcodec/g722dec.c
libavcodec/g723_1.c
libavcodec/g726.c