diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:30:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:30:20 +0100 |
| commit | e73b3dba3e8084eb7141c2a8e27fba4950f2ba60 (patch) | |
| tree | 7801d9883ec0592c24b9a21264420efc58039387 /libavutil/aes.h | |
| parent | 2ab3088dda31103351eb839f2d53674dc2936a97 (diff) | |
| parent | 990e4a6639d0714198583c2812b1074b5751898f (diff) | |
| download | ffmpeg-e73b3dba3e8084eb7141c2a8e27fba4950f2ba60.tar.gz | |
Merge commit '990e4a6639d0714198583c2812b1074b5751898f'
* commit '990e4a6639d0714198583c2812b1074b5751898f':
Add a QSV decoding example.
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.h')
0 files changed, 0 insertions, 0 deletions