[FFmpeg-cvslog] Merge commit '502512ea0f179165782777265f441d4061ff6012'
Michael Niedermayer
git at videolan.org
Wed Apr 23 00:47:21 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 23 00:37:16 2014 +0200| [c2cd0945c9aea2ad3a9cd3fdf7e95020ab4d6536] | committer: Michael Niedermayer
Merge commit '502512ea0f179165782777265f441d4061ff6012'
* commit '502512ea0f179165782777265f441d4061ff6012':
avutil: Add av_get_time_base_q()
Conflicts:
doc/APIchanges
libavutil/utils.c
libavutil/version.h
See: dac7e8a94e49e41f1dd0af34dc17d124d5b156ba
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2cd0945c9aea2ad3a9cd3fdf7e95020ab4d6536
---
More information about the ffmpeg-cvslog
mailing list