diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 21:14:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 21:14:56 +0200 |
| commit | 5b4c8aac97863b4830717db6cb2cd4e3093f9a88 (patch) | |
| tree | 84d71b43257dac63fb4bf30b9e9b1d8fd2784c23 /tools/gen-rc | |
| parent | 8522dd380b2a0f98cfaafcf0ae64bd46ac031ae1 (diff) | |
| parent | a16431034d9bd44182bf844d6bbde2c98bc4e6b5 (diff) | |
| download | ffmpeg-5b4c8aac97863b4830717db6cb2cd4e3093f9a88.tar.gz | |
Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'
* commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5':
hls: Factor the sequence computation
Conflicts:
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/gen-rc')
0 files changed, 0 insertions, 0 deletions