Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 11:56:56 +0000 (13:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 11:56:56 +0000 (13:56 +0200)
* commit '04db5794cd97e4b33ec2f963ef7f967722a456eb':
  hevc: templatize pred_planar

Conflicts:
libavcodec/hevcpred_template.c

See: 053fdacde76a38186dc9db658572e38686efe0c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hevcpred_template.c

Simple merge