Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:04:35 +0000 (00:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:05:04 +0000 (00:05 +0100)
commit40e123bc67cca2bb44a737e250481edc1b93048a
treee5bf467e5bc476eb091e6cdb7f6e5eb53095d476
parentf2f88b952d666587fa6292bb219a82d0bee2229f
parented97963bdbf3bb17fca4f9ea0aa1a97722dec907
Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ulti.c