[FFmpeg-cvslog] Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 12:04:46 2013 +0200| [a0fb6083967afcd7f2c43ab3ff1e510912644daa] | committer: Michael Niedermayer

Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'

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

Conflicts:
	libavformat/mpegts.c

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

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