Michael Niedermayer 0dff771f31 Merge commit '205a95f7b5178362874bc1e65eae9866723491c1' ...

* commit '205a95f7b5178362874bc1e65eae9866723491c1':
  wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
  wma: decode directly to the user-provided AVFrame
  wmapro: decode directly to the user-provided AVFrame
  wavpack: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-02-13 12:49:48 +01:00

64 KiB

Raw Blame History

View Raw