[FFmpeg-cvslog] Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'
Michael Niedermayer
git at videolan.org
Thu Oct 10 09:45:10 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 10 09:37:55 2013 +0200| [20669753ce85adc929efb77dd503ab84c9415fe8] | committer: Michael Niedermayer
Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'
* commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4':
vmnc: Check the cursor dimensions
Conflicts:
libavcodec/vmnc.c
See: 94372592767fb551060217df37f5aa3130ba1ca8
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20669753ce85adc929efb77dd503ab84c9415fe8
---
More information about the ffmpeg-cvslog
mailing list