diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 13:58:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 13:59:27 +0200 |
| commit | 07440c938073c6c83b8b3592dfade690bab9c19e (patch) | |
| tree | 3b1931abad1c326635569947f0d07ff450a0b3b5 /libavcodec/rangecoder.c | |
| parent | f7bc03bcaff5b15e566110f73db0f1fc0d24a717 (diff) | |
| parent | eb33ba04e03d9f36e23fffd442510c824be709c3 (diff) | |
| download | ffmpeg-07440c938073c6c83b8b3592dfade690bab9c19e.tar.gz | |
Merge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'
* commit 'eb33ba04e03d9f36e23fffd442510c824be709c3':
hls: Return all packets from a previous variant before moving on to the next one
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions