diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:33:27 +0100 |
commit | 0a731e45964cda0606fc04128f41353d8282f091 (patch) | |
tree | 652c5ac32280da901becae1c152ea73012bab921 /libavcodec/allcodecs.c | |
parent | d985976e54aec274d0c261091f77559d1a1bef84 (diff) | |
parent | 72b7441a10f578a1d0be7083d8f5adf6a01921c2 (diff) |
Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
lavc: add Intel libmfx-based H.264 encoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index c5da121236..10aad4cb75 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -554,6 +554,7 @@ void avcodec_register_all(void) /* external libraries, that shouldn't be used by default if one of the * above is available */ REGISTER_ENCODER(LIBOPENH264, libopenh264); + REGISTER_ENCODER(H264_QSV, h264_qsv); /* parsers */ REGISTER_PARSER(AAC, aac); |