[FFmpeg-cvslog] Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 13:18:42 2014 +0100| [a51eb6d34ceda7cc4f46fc3f9d0e9b57eba61cb6] | committer: Michael Niedermayer

Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a51eb6d34ceda7cc4f46fc3f9d0e9b57eba61cb6
---