diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:23:48 +0100 |
| commit | e3755119fae71c9e34b630679c2805fcf1c97e2c (patch) | |
| tree | 59f417c9cbac3e3c8028be8a950435018de2c4ec /libavfilter/af_apad.c | |
| parent | 65da611d3415dd859d92c00d59fecbb5bba68692 (diff) | |
| parent | 5b1d9ceec715846a58fe029bc3889ed6fa62436a (diff) | |
| download | ffmpeg-e3755119fae71c9e34b630679c2805fcf1c97e2c.tar.gz | |
Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'
* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
pixfmt: add a pixel format for QSV hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_apad.c')
0 files changed, 0 insertions, 0 deletions