[FFmpeg-cvslog] Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 15:42:29 2014 +0200| [1a5871d1bec6863dfee05c9cc8b97e2307530ce6] | committer: Michael Niedermayer

Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866':
  lavc: deprecate unused mb_threshold field

Conflicts:
	libavcodec/options_table.h

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

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