diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 12:25:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 12:25:39 +0100 |
commit | 7d63f10c37cd9327c39ae4e3e7ec389c08b87390 (patch) | |
tree | f8306101f81a1b5fb46199101105eae63210ddf2 | |
parent | d5232d4717ec815b5ccb1baf3bc758f1e063010a (diff) | |
parent | 9c8074050745184a61059ad56045ad711299e33d (diff) | |
download | ffmpeg-7d63f10c37cd9327c39ae4e3e7ec389c08b87390.tar.gz |
Merge commit '9c8074050745184a61059ad56045ad711299e33d'
* commit '9c8074050745184a61059ad56045ad711299e33d':
configure: Mark qsv subsystem as not selectable on the command line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1481,7 +1481,6 @@ SUBSYSTEM_LIST=" mdct pixelutils network - qsv rdft " @@ -1889,6 +1888,7 @@ CONFIG_EXTRA=" nettle pixblockdsp qpeldsp + qsv rangecoder riffdec riffenc |