diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:04:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:04:27 +0200 |
| commit | d31c0fcfa55a841bc47d44bedd407b2c623f939a (patch) | |
| tree | 1053c826a19edcd6eff11f4f7db8d55cf8e113ab /libavcodec/rangecoder.c | |
| parent | 07440c938073c6c83b8b3592dfade690bab9c19e (diff) | |
| parent | cdd2d73d315ecaf19ff49e64c91923275f1bda68 (diff) | |
| download | ffmpeg-d31c0fcfa55a841bc47d44bedd407b2c623f939a.tar.gz | |
Merge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'
* commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68':
hls: Don't check discard flags until the parent demuxer's streams actually exist
hls: Copy the time base from the chained demuxer
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions