[FFmpeg-cvslog] Merge commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 22 01:23:42 2014 +0100| [148506c965dde46ca8166c04f398bd8e85f81f3c] | committer: Michael Niedermayer

Merge commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0'

* commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0':
  hevc: Spin the mv_mpv_mode calls in a stand alone function

Conflicts:
	libavcodec/hevc.c

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

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