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)
* commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6':
  indeo2: rename stride to pitch for consistency with other Indeo decoders

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

Simple merge