summaryrefslogtreecommitdiff
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-05-11 19:19:05 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-05-11 19:19:28 +0100
commit0e38723220824d849ca37090e61d75633a16858a (patch)
tree6c792d2d92c365f6aa954c472776107c282e9a19 /libavcodec/allcodecs.c
parentf4c88eef95e6d4a2463ce2fbae2c5d1a20eb1373 (diff)
parente8919ec486a5559fdcf366e347be0656d904a87f (diff)
Merge commit 'e8919ec486a5559fdcf366e347be0656d904a87f'
* commit 'e8919ec486a5559fdcf366e347be0656d904a87f': libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index c5b675baa5..b98e0fb829 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -620,6 +620,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER(H264_QSV, h264_qsv);
REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);
REGISTER_ENCODER(NVENC, nvenc);
+ REGISTER_ENCODER(H264_OMX, h264_omx);
REGISTER_ENCODER(NVENC_H264, nvenc_h264);
REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc);
REGISTER_ENCODER(HEVC_QSV, hevc_qsv);