[FFmpeg-cvslog] Merge commit 'c44191039944526dd7eb6e536990b555837961f5'
Michael Niedermayer
git at videolan.org
Tue Jul 30 10:18:11 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 10:12:48 2013 +0200| [4971551fd215b8c7e9f3e20fc1536bb2150c84b4] | committer: Michael Niedermayer
Merge commit 'c44191039944526dd7eb6e536990b555837961f5'
* commit 'c44191039944526dd7eb6e536990b555837961f5':
hls: Store all durations in 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=4971551fd215b8c7e9f3e20fc1536bb2150c84b4
---
More information about the ffmpeg-cvslog
mailing list