[FFmpeg-cvslog] Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 13:56:56 2014 +0200| [93318983c3e565b3079362ec69cf3362febc5004] | committer: Michael Niedermayer

Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'

* commit '04db5794cd97e4b33ec2f963ef7f967722a456eb':
  hevc: templatize pred_planar

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=93318983c3e565b3079362ec69cf3362febc5004
---