Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 12:18:42 +0000 (13:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 12:19:26 +0000 (13:19 +0100)
commita51eb6d34ceda7cc4f46fc3f9d0e9b57eba61cb6
tree29569c477d611545385d5d323a9fc02f92617b76
parent042eba52a5ff4939b8c548a9fb5e209790c17b37
parent56dc46a1893251e74be1ad63e54fb38d754bb1fe
Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'

* commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe':
  riffenc: do not fall back on AVCodecContext.frame_size for MP3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/riffenc.c