diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:11:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:11:21 +0200 |
| commit | 2f9e97b32a7a541095654bed2e8763dd79c98366 (patch) | |
| tree | 48572ff1a2ceb6deb102a91e0f1b6fa13397b2e5 /libavformat/Makefile | |
| parent | d31c0fcfa55a841bc47d44bedd407b2c623f939a (diff) | |
| parent | c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622 (diff) | |
| download | ffmpeg-2f9e97b32a7a541095654bed2e8763dd79c98366.tar.gz | |
Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'
* commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622':
hls: Set stream offset before opening a chained demuxer
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
0 files changed, 0 insertions, 0 deletions