Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:18:37 +0000 (14:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:18:37 +0000 (14:18 +0200)
commit65dcb544934463db871b667fe2b9dd38d5bf48a4
treea83cc2fd944341d53db83eea0e08bae285838f5c
parent2f9e97b32a7a541095654bed2e8763dd79c98366
parent9d64f236292ba28018dd9afd2d57f8f944b33f81
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>
libavformat/hls.c