[FFmpeg-cvslog] Merge commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 14:10:13 2014 +0200| [8447658550006996d30e232b1d77614c92a4cc5e] | committer: Michael Niedermayer

Merge commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00'

* commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00':
  hevc: templatize intra_pred

Conflicts:
	libavcodec/hevc.h

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

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