Merge commit '30e50c50'

* commit '30e50c50':
  lavf: eliminate ff_get_audio_frame_size()

Conflicts:
	libavformat/utils.c

Not merged as the removed code is needed for some bugfixes and
would break the fate tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>