* commit 'ec4f04da':
  avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

Conflicts:
	libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>