Merge commit '205a95f7b5178362874bc1e65eae9866723491c1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:49:48 +0000 (12:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:49:48 +0000 (12:49 +0100)
commit0dff771f31cffffec0e16944d3890564c2da16eb
tree6c6ab0759ebf48fd5a7a478f97fb2110b4c5ad6e
parentdca6fb08a71b8201f0a32f9cff18e7753355733a
parent205a95f7b5178362874bc1e65eae9866723491c1
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>
libavcodec/wavpack.c
libavcodec/wma.c
libavcodec/wma.h
libavcodec/wmadec.c
libavcodec/wmaenc.c
libavcodec/wmaprodec.c