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)
* commit '9d64f236292ba28018dd9afd2d57f8f944b33f81':
  hls: Respect the different stream time bases when comparing dts

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/hls.c

Simple merge