Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 00:09:41 +0000 (02:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 00:09:41 +0000 (02:09 +0200)
commit6542e5575f1425ecc9972a1bb7477d03816e40d0
tree9b836b016e7c9a502a3bb43d77c285deaa4c09bd
parent0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c
parentec4f04da1a3462dac429b9d15dee5f027309da15
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@gmx.at>
libavformat/avformat.h
libavformat/avio.c
libavformat/format.c
libavformat/url.h