Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 10:41:15 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 10:41:15 +0000 (12:41 +0200)
commit22a0249debb1b7dceee4820b6c067be3a7e88ccc
treea00ecb65001d36aaff2bdffa7f15e0eeae6925ee
parent71d008ebe4f96974433eecfd3575bc82eb4b06a8
parentbb41115d56930b9f5d59e79dca254d1201246967
Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'

* commit 'bb41115d56930b9f5d59e79dca254d1201246967':
  imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

Conflicts:
libavutil/internal.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/imgutils.h
libavutil/internal.h
libavutil/version.h