[FFmpeg-cvslog] Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 13:14:41 2013 +0100| [b71e4d8717450e6d6d08125fbd24a74f082dff71] | committer: Michael Niedermayer

Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'

* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65':
  lavc: make error_rate a private option of mpegvideo encoders

Conflicts:
	libavcodec/options_table.h
	libavcodec/version.h

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

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