[FFmpeg-cvslog] Merge commit '46439e156219d27f059cf687743ba5aacf238b87'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 02:24:42 2014 +0200| [352e13e2a9914c623fc53fab3ff49a21e9232674] | committer: Michael Niedermayer

Merge commit '46439e156219d27f059cf687743ba5aacf238b87'

* commit '46439e156219d27f059cf687743ba5aacf238b87':
  mp2: match twolame default options

Not merged as the change breaks fate, also forcing resampling to specific sample rate
reduces quality, and would be like rescaling every movie to 1080.

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

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