diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-29 14:18:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-29 14:18:37 +0200 |
| commit | 65dcb544934463db871b667fe2b9dd38d5bf48a4 (patch) | |
| tree | a83cc2fd944341d53db83eea0e08bae285838f5c /libavutil/parseutils.c | |
| parent | 2f9e97b32a7a541095654bed2e8763dd79c98366 (diff) | |
| parent | 9d64f236292ba28018dd9afd2d57f8f944b33f81 (diff) | |
Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'
* commit '9d64f236292ba28018dd9afd2d57f8f944b33f81':
hls: Respect the different stream time bases when comparing dts
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions