-
Michael Niedermayer authored
* commit 'a1643103': hls: Factor the sequence computation Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5b4c8aac
* commit 'a1643103': hls: Factor the sequence computation Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>