diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-30 21:29:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-30 21:29:04 +0200 |
| commit | 554a1ecab7efbdaf10ab459d73152bfb6e355dfa (patch) | |
| tree | 5acd189ee221e94ac72514755b45c3c0e0e3eb07 /libavformat/librtmp.c | |
| parent | 5b4c8aac97863b4830717db6cb2cd4e3093f9a88 (diff) | |
| parent | 7266e24f176389d2e81bfc7c829934f7c8ae361c (diff) | |
Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'
* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
hls: Sync the file number with the start sequence
Conflicts:
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/librtmp.c')
0 files changed, 0 insertions, 0 deletions