Merge "Finish up B frame support in MPEG4Writer"