[FFmpeg-cvslog] Merge commit '4f373a5111f900af54301907132942f95276285c'
Michael Niedermayer
git at videolan.org
Sat Apr 11 02:27:01 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 11 01:35:16 2015 +0200| [d4a6c9404601ccf0b035477699fa2a9b9b1f515a] | committer: Michael Niedermayer
Merge commit '4f373a5111f900af54301907132942f95276285c'
* commit '4f373a5111f900af54301907132942f95276285c':
vfwcap: Unbreak building after c201069fa
Conflicts:
libavdevice/vfwcap.c
See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4a6c9404601ccf0b035477699fa2a9b9b1f515a
---
More information about the ffmpeg-cvslog
mailing list