[FFmpeg-cvslog] Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 27 02:09:41 2014 +0200| [6542e5575f1425ecc9972a1bb7477d03816e40d0] | committer: Michael Niedermayer

Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'

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

Conflicts:
	libavformat/format.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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