diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:39:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:40:31 +0200 |
| commit | 4a5074d7987e985645484c269e6f01faeec62da5 (patch) | |
| tree | 2c6ada8ffe22c695ed6cae7512366a862bbc0c35 /libavcodec/ptx.c | |
| parent | 2ecbf44f21c09f8f03bf142b6ce033d5da2cd731 (diff) | |
| parent | 84b223cc6d6ed4cc8bd295457a90f7c94a9dd784 (diff) | |
| download | ffmpeg-4a5074d7987e985645484c269e6f01faeec62da5.tar.gz | |
Merge commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784'
* commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784':
configure: Make the new qsv encoder depend on libmfx
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ptx.c')
0 files changed, 0 insertions, 0 deletions