Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 10:04:46 +0000 (12:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 10:04:46 +0000 (12:04 +0200)
commita0fb6083967afcd7f2c43ab3ff1e510912644daa
treec8c71575049cf763b9acc8b8cf91e026650f607a
parentf09b5fb4afedb711b169a582b2c1b1c61e6653e0
parent5afe1d27912be9b643ffb4ddc21f6d920260dbb0
Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'

* commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0':
  avio: Add const qualifiers to ffio_read_indirect

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avio_internal.h
libavformat/aviobuf.c
libavformat/mpegts.c