[FFmpeg-cvslog] Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'
Michael Niedermayer
git at videolan.org
Tue Jul 30 10:08:37 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 10:03:02 2013 +0200| [5a270296cb014de3bf8d12aece0bdd7cecad5318] | committer: Michael Niedermayer
Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'
* commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce':
hls: Store first_timestamp in units of AV_TIME_BASE
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a270296cb014de3bf8d12aece0bdd7cecad5318
---
More information about the ffmpeg-cvslog
mailing list