[FFmpeg-cvslog] Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'

[Michael Niedermayer]

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

Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'

* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
  lavc: deprecate unused me_threshold field

Conflicts:
	ffmpeg.c

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

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