FFmpeg/libavcodec
Michael Niedermayer d13f434dbb 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>
2013-02-13 11:39:05 +01:00
..
2013-02-06 10:21:52 +01:00
2013-02-10 14:44:00 +01:00
2013-02-11 11:04:52 +00:00
2013-02-05 00:37:20 +01:00
2013-01-31 04:21:26 +01:00
2013-01-29 19:11:28 +01:00
2013-01-29 11:01:19 +11:00
2013-01-31 00:02:17 +01:00
2013-02-03 13:08:36 +01:00
2013-02-06 16:46:23 +01:00
2013-02-09 14:22:29 +01:00
2013-02-09 19:32:43 +00:00
2013-02-09 21:21:26 +01:00
2013-01-30 23:12:57 +01:00