* commit '6b45f05e':
  parseutils: fix discarding const attribute warning

Conflicts:
	libavutil/parseutils.c

See: fe87b2e7Merged-by: Michael Niedermayer <michaelni@gmx.at>