[FFmpeg-cvslog] Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  7 00:04:35 2015 +0100| [40e123bc67cca2bb44a737e250481edc1b93048a] | committer: Michael Niedermayer

Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'

* commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907':
  ulti: invert the order of parameters of ulti_decode_frame()

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40e123bc67cca2bb44a737e250481edc1b93048a
---