Flac bitrate calculation

Changed to use the same calculation, with rounding, for the bitrate in both locations.
Also reverted a random block of code that became indented recently.  I think this is correct.