[FFmpeg-cvslog] Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 12:41:15 2014 +0200| [22a0249debb1b7dceee4820b6c067be3a7e88ccc] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22a0249debb1b7dceee4820b6c067be3a7e88ccc
---