Michael Niedermayer 2becf21d9f Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca' ...

* commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca':
  tak: decode directly to the user-provided AVFrame
  smackaud: decode directly to the user-provided AVFrame
  sipr: decode directly to the user-provided AVFrame
  shorten: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/shorten.c
	libavcodec/takdec.c

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

2013-02-13 12:35:37 +01:00

19 KiB

Raw Blame History

View Raw