[FFmpeg-cvslog] Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 20:12:17 2014 +0200| [67979b593699ea02ba1b9c60db53e15dcd5fbc1c] | committer: Michael Niedermayer

Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'

* commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818':
  segment: Report the current media sequence

Conflicts:
	libavformat/segment.c

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

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