diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 09:37:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 09:39:07 +0200 |
| commit | 20669753ce85adc929efb77dd503ab84c9415fe8 (patch) | |
| tree | 1d1b7c8bf500832ffdee2888800a654f2d7fefad /libavdevice/v4l2enc.c | |
| parent | f18db82f291ced9ae07765a12afc8a47c89ee2b7 (diff) | |
| parent | 5e992a4682d2c09eed3839c6cacf70db3b65c2f4 (diff) | |
| download | ffmpeg-20669753ce85adc929efb77dd503ab84c9415fe8.tar.gz | |
Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'
* commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4':
vmnc: Check the cursor dimensions
Conflicts:
libavcodec/vmnc.c
See: 94372592767fb551060217df37f5aa3130ba1ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2enc.c')
0 files changed, 0 insertions, 0 deletions