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)
commit93318983c3e565b3079362ec69cf3362febc5004
tree52535077257899903db9906d27e618a4734a2f62
parent4a30f08505a4e85718896ff233c97be41a9754ca
parent04db5794cd97e4b33ec2f963ef7f967722a456eb
Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'

* commit '04db5794cd97e4b33ec2f963ef7f967722a456eb':
  hevc: templatize pred_planar

Conflicts:
libavcodec/hevcpred_template.c

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