[FFmpeg-cvslog] Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'
Michael Niedermayer
git at videolan.org
Mon Jul 29 14:29:33 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 14:18:37 2013 +0200| [65dcb544934463db871b667fe2b9dd38d5bf48a4] | committer: Michael Niedermayer
Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'
* commit '9d64f236292ba28018dd9afd2d57f8f944b33f81':
hls: Respect the different stream time bases when comparing dts
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65dcb544934463db871b667fe2b9dd38d5bf48a4
---
More information about the ffmpeg-cvslog
mailing list