Merge commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 12:28:02 +0000 (14:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 12:28:49 +0000 (14:28 +0200)
commit454920187f152fc9d058225095cc8291c55c4f4a
treed2f480423d88b11c95d329549f50eaaf28db8e97
parent8447658550006996d30e232b1d77614c92a4cc5e
parent4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7
Merge commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7'

* commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7':
  hevc/intra_pred: optimize EXTEND_()*

Conflicts:
libavcodec/hevcpred_template.c

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