Merge commit '898276c16b1683ac77723e97574a3bfdb29507fd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 22:57:03 +0000 (23:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 23:04:49 +0000 (00:04 +0100)
* commit '898276c16b1683ac77723e97574a3bfdb29507fd':
  r3d: Fix pos type

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

Simple merge