diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:16:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:16:21 +0100 |
| commit | b12eacb3837cad2daaeda1f77ceb1045bca68789 (patch) | |
| tree | 10428214a95fd2fce6c115ebf0dac9c709d35b4f /libavdevice | |
| parent | 151ae8ea5b54e12da6d53fa96d67026371e760ea (diff) | |
| parent | d0a63d8b989647ffdb5f40da8e1feaffe1a8e791 (diff) | |
| download | ffmpeg-b12eacb3837cad2daaeda1f77ceb1045bca68789.tar.gz | |
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
qsvdec: split off some code that will be shared with the encoder
Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions