Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg