Merge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 23:11:59 +0000 (00:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 23:14:11 +0000 (00:14 +0100)
* commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30':
  flv: Use the correct type to hold the file offset

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

Simple merge