Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:18:55 +0000 (11:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:27:54 +0000 (11:27 +0100)
commit4789955ec4260f9e8f99b8d774ada2ad679d5630
treeb94dfe29f21daf81a3fe5d759e093c26de7be7e3
parent2acd5fb5532587507ab197788338ae55bf9128aa
parente57daa876bf0cf50782550e366e589441cd8c2bd
Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd'

* commit 'e57daa876bf0cf50782550e366e589441cd8c2bd':
  adpcm: decode directly to the user-provided AVFrame
  ac3: decode directly to the user-provided AVFrame
  aac: decode directly to the user-provided AVFrame
  8svx: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/8svx.c
libavcodec/ac3dec.c
libavcodec/adpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/8svx.c
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/adpcm.c