diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
| commit | 5a284d076ffdca705204e3e4100917cd4dbda14c (patch) | |
| tree | 409db710f32304c4192b2cebf4446bb0242b8189 /libavcodec/allcodecs.c | |
| parent | fcca7671e29b67812d29af710ff90486944ee428 (diff) | |
| parent | 22526c1f557a72b3285d295bd8b30c40eb65d437 (diff) | |
| download | ffmpeg-streaming-5a284d076ffdca705204e3e4100917cd4dbda14c.zip ffmpeg-streaming-5a284d076ffdca705204e3e4100917cd4dbda14c.tar.gz | |
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
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 a3d8c1e..2552962 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -178,6 +178,7 @@ void avcodec_register_all(void) REGISTER_DECODER(H264_VDPAU, h264_vdpau); REGISTER_DECODER(HEVC, hevc); REGISTER_DECODER(HNM4_VIDEO, hnm4_video); + REGISTER_DECODER(HQ_HQA, hq_hqa); REGISTER_DECODER(HQX, hqx); REGISTER_ENCDEC (HUFFYUV, huffyuv); REGISTER_DECODER(IDCIN, idcin); |
