diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:33:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:47:32 +0200 |
commit | 55219a78c7d04d1937384366ba911c5d75c5c1e4 (patch) | |
tree | 85efaa581ea0a51328bb8dda18727b84021b4c80 /libavcodec/allcodecs.c | |
parent | 4df3cf90bf7a54793e90304bd1b6c7599673f36a (diff) | |
parent | 7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7 (diff) |
Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
Hap decoder and encoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/allcodecs.c
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 25462a60d8..73e1d1b683 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -181,6 +181,7 @@ void avcodec_register_all(void) REGISTER_DECODER(H264_QSV, h264_qsv); REGISTER_DECODER(H264_VDA, h264_vda); REGISTER_DECODER(H264_VDPAU, h264_vdpau); + REGISTER_ENCDEC (HAP, hap); REGISTER_DECODER(HEVC, hevc); REGISTER_DECODER(HNM4_VIDEO, hnm4_video); REGISTER_DECODER(HQ_HQA, hq_hqa); |