[FFmpeg-cvslog] Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'
Michael Niedermayer
git at videolan.org
Fri Jun 20 16:59:57 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 16:40:04 2014 +0200| [4a993335812f7e9b2088145c7d043c01019c5d04] | committer: Michael Niedermayer
Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'
* commit '874390e163427c1fe7682ab27924a7843780dbb3':
lavc: add a convenience function for rescaling timestamps in a packet
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a993335812f7e9b2088145c7d043c01019c5d04
---
More information about the ffmpeg-cvslog
mailing list