[FFmpeg-cvslog] Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 01:58:28 2013 +0100| [2951b7fb1d3be236312e27a6dd6dc1dcfc467841] | committer: Michael Niedermayer

Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'

* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0':
  mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()

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

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