diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 20:12:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 20:14:50 +0200 |
| commit | 67979b593699ea02ba1b9c60db53e15dcd5fbc1c (patch) | |
| tree | b4babc1e58fcb19a5a3ee90a5d1e9e27ddd288e8 /libavformat/rl2.c | |
| parent | f21f969a3f2a47df7099a03729b56d45fc6d084b (diff) | |
| parent | 87a3ea3192bf5e4aafa08bca8686a2b577eae818 (diff) | |
| download | ffmpeg-67979b593699ea02ba1b9c60db53e15dcd5fbc1c.tar.gz | |
Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'
* commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818':
segment: Report the current media sequence
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rl2.c')
0 files changed, 0 insertions, 0 deletions