diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:18:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:18:37 +0200 |
| commit | 65dcb544934463db871b667fe2b9dd38d5bf48a4 (patch) | |
| tree | a83cc2fd944341d53db83eea0e08bae285838f5c /libavcodec/rangecoder.c | |
| parent | 2f9e97b32a7a541095654bed2e8763dd79c98366 (diff) | |
| parent | 9d64f236292ba28018dd9afd2d57f8f944b33f81 (diff) | |
| download | ffmpeg-65dcb544934463db871b667fe2b9dd38d5bf48a4.tar.gz | |
Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'
* commit '9d64f236292ba28018dd9afd2d57f8f944b33f81':
hls: Respect the different stream time bases when comparing dts
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions