Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 23:11:49 +0000 (01:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 23:11:59 +0000 (01:11 +0200)
commit826726b83fab660e45166bca476c4e91713c62aa
tree4e4ba099aa1b6de1fe23a827bb4225a0357ca540
parentad081e4def36cba8070b1cc883f168df194c3bed
parent422e14f721c22cf9c19a8e7aae051ba9d559f6b6
Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'

* commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6':
  indeo2: rename stride to pitch for consistency with other Indeo decoders

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