[FFmpeg-cvslog] Merge commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 14:28:02 2014 +0200| [454920187f152fc9d058225095cc8291c55c4f4a] | committer: Michael Niedermayer

Merge commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7'

* commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7':
  hevc/intra_pred: optimize EXTEND_()*

Conflicts:
	libavcodec/hevcpred_template.c

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

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