Revise nomenclature and formatting in previous change, as well as restore code flushing buffer missing from previous change.
Revise nomenclature and formatting in previous change,
as well as restore code flushing buffer missing from previous change.

donmelton/video_transcoding