Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Feb 2015 11:32:30 +0000 (12:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Feb 2015 11:34:18 +0000 (12:34 +0100)
commit3e2714992b5023260ebfafd5d8f7d4cd0e2bdd80
tree81b173c79aa35988f07637623c1bb9aa09463dac
parentc74b3983f99a2a177904bd0b997528c1185e1231
parenteea769df322fac2601a96db195fa7dc8d12a8fbc
Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'

* commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc':
  hevc: Use generic av_clip function, not C implementation

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c

See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c