diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:03:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:19:26 +0100 |
commit | 2cf521718d9427329b9324b00fb59caddcf42782 (patch) | |
tree | 3802359d7d10019217a6d63c5ada55c6373a8c96 /libavcodec/allcodecs.c | |
parent | c0f02b220182cc7997bd6b5279881b898f52dfbf (diff) | |
parent | 35c6ce76b107225a19eb33aea38857d2405882af (diff) | |
download | ffmpeg-2cf521718d9427329b9324b00fb59caddcf42782.tar.gz |
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
Canopus HQX decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak
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 9f763b27c1..a2bea0c035 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -176,6 +176,7 @@ void avcodec_register_all(void) REGISTER_DECODER(H264_VDPAU, h264_vdpau); REGISTER_DECODER(HEVC, hevc); REGISTER_DECODER(HNM4_VIDEO, hnm4_video); + REGISTER_DECODER(HQX, hqx); REGISTER_ENCDEC (HUFFYUV, huffyuv); REGISTER_DECODER(IDCIN, idcin); REGISTER_DECODER(IFF_BYTERUN1, iff_byterun1); |