Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:35:37 +0000 (12:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:35:37 +0000 (12:35 +0100)
commit2becf21d9fd841962f87ad4e273274ee81a35bad
tree69b350cf5d5fc530698b6981442f1af89b221fac
parent08059f6150fcf75d884670cdbdbdf8830fa199bd
parent4a2b26fc1b1ad123eba473a20e270f2b0ba92bca
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>
libavcodec/shorten.c
libavcodec/sipr.c
libavcodec/sipr.h
libavcodec/smacker.c
libavcodec/takdec.c