Merge commit '5d5c248c3df30fa91a8dde639618c985b9a11c53'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:28:22 +0000 (12:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:28:27 +0000 (12:28 +0100)
commit08059f6150fcf75d884670cdbdbdf8830fa199bd
tree3e3c42784e6b34b0de16fa3fad2fbd852f59137c
parent65da7007043cf4fb99b72c7f823cfc15e429b45f
parent5d5c248c3df30fa91a8dde639618c985b9a11c53
Merge commit '5d5c248c3df30fa91a8dde639618c985b9a11c53'

* commit '5d5c248c3df30fa91a8dde639618c985b9a11c53':
  s302m: decode directly to the user-provided AVFrame
  ra288: decode directly to the user-provided AVFrame
  ra144: decode directly to the user-provided AVFrame
  ralf: decode directly to the user-provided AVFrame
  qdm2: decode directly to the user-provided AVFrame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/qdm2.c
libavcodec/ra144.h
libavcodec/ra144dec.c
libavcodec/ra288.c
libavcodec/s302m.c