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)
commit6fc9f5e0ff77f827ae0982099b8fcc683bf0063c
treef0e11ec86e09319f605e67c746cdb96da5549950
parent0c16f6449bb559eca2982c96e79eb7cee7abbfd8
parentf412b2c9f3a7add0ab8021262ec4bad249347e30
Merge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'

* commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30':
  flv: Use the correct type to hold the file offset

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