Merge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:36:28 +0000 (11:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 10:39:05 +0000 (11:39 +0100)
commitd13f434dbb55348b3ed761e4f4c2ff9c7be4ea4b
tree6591e3d29559c2dacdea43049b128790993be84c
parent4789955ec4260f9e8f99b8d774ada2ad679d5630
parente3db34291f4401a16f6ac92721617a9f33cd4c31
Merge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31'

* commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31':
  amrnb: decode directly to the user-provided AVFrame
  als: decode directly to the user-provided AVFrame
  alac: decode directly to the user-provided AVFrame
  adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
  adx: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/alsdec.c
libavcodec/amrnbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/adx.h
libavcodec/adxdec.c
libavcodec/adxenc.c
libavcodec/alac.c
libavcodec/alsdec.c
libavcodec/amrnbdec.c