[FFmpeg-cvslog] Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
Michael Niedermayer
git at videolan.org
Sun Jan 26 02:14:10 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 26 01:39:33 2014 +0100| [965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35] | committer: Michael Niedermayer
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec':
avutil: remove timer.h include from internal.h
Conflicts:
libavcodec/ffv1dec.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=965fa6b0d9d99afbbef8b3fcb8066ce4136b8c35
---
More information about the ffmpeg-cvslog
mailing list