Merge commit '30e50c50274f88f0f5ae829f401cd3c7f5266719'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 23:02:26 +0000 (01:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 23:12:12 +0000 (01:12 +0200)
* commit '30e50c50274f88f0f5ae829f401cd3c7f5266719':
  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>

Trivial merge