diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 20:27:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 20:27:41 +0200 |
| commit | cdd0ad7be1f94c4c44219d8afecb6a3e1c23041b (patch) | |
| tree | c53f1281f5c458ec35870543a5fbeac9823299f5 /libavdevice/v4l2enc.c | |
| parent | e348a81a66851e35b9f6facf70c678e886bd3805 (diff) | |
| parent | 41e1354c101004ccd46dc08d3dd6e956e83a6b51 (diff) | |
| download | ffmpeg-cdd0ad7be1f94c4c44219d8afecb6a3e1c23041b.tar.gz | |
Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'
* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51':
proresenc: Properly account for alpha plane
Conflicts:
libavcodec/proresenc_kostya.c
See: 117bc8e6ffc744fedcf77edf2fdb33c964b83370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2enc.c')
0 files changed, 0 insertions, 0 deletions