Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Jun 2013 23:25:32 +0000 (01:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Jun 2013 23:25:50 +0000 (01:25 +0200)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge