Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 18:12:17 +0000 (20:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 18:14:50 +0000 (20:14 +0200)
commit67979b593699ea02ba1b9c60db53e15dcd5fbc1c
treeb4babc1e58fcb19a5a3ee90a5d1e9e27ddd288e8
parentf21f969a3f2a47df7099a03729b56d45fc6d084b
parent87a3ea3192bf5e4aafa08bca8686a2b577eae818
Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'

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

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/segment.c