-
Michael Niedermayer authored
* commit '87a3ea31': segment: Report the current media sequence Conflicts: libavformat/segment.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
67979b59
* commit '87a3ea31': segment: Report the current media sequence Conflicts: libavformat/segment.c Merged-by:Michael Niedermayer <michaelni@gmx.at>