Merge commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 12:10:13 +0000 (14:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 12:10:13 +0000 (14:10 +0200)
commit8447658550006996d30e232b1d77614c92a4cc5e
tree049e2d57d62f1946b625f9c21035af5d7c664033
parent93318983c3e565b3079362ec69cf3362febc5004
parenta1c2b48018b09d2613f075ec0748c95bd520ac00
Merge commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00'

* commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00':
  hevc: templatize intra_pred

Conflicts:
libavcodec/hevc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c
libavcodec/hevcpred.c
libavcodec/hevcpred.h
libavcodec/hevcpred_template.c