X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fmod.rs;h=656be0a081039f08c2bb1790fa82b5be98020d67;hp=ccd5f36d53f896213d70265f7d0ae21d885e0987;hb=6a4942885d50ab644f27d0d25aee0b2740dce509;hpb=40e9529189ad00f3306baa873d6b2bbc46204957

diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs
index ccd5f36..656be0a 100644
--- a/nihav-duck/src/codecs/mod.rs
+++ b/nihav-duck/src/codecs/mod.rs
@@ -12,10 +12,17 @@ mod truemotionrt;
 mod truemotion2;
 #[cfg(feature="decoder_truemotion2x")]
 mod truemotion2x;
+#[cfg(any(feature="decoder_vp3", feature="decoder_vp4", feature="decoder_vp5", feature="decoder_vp6", feature="decoder_vp7"))]
+#[macro_use]
+mod vpcommon;
 #[cfg(any(feature="decoder_vp3", feature="decoder_vp4"))]
 mod vp3;
 #[cfg(any(feature="decoder_vp5", feature="decoder_vp6"))]
 mod vp56;
+#[cfg(feature="decoder_vp5")]
+mod vp5;
+#[cfg(feature="decoder_vp6")]
+mod vp6;
 #[cfg(feature="decoder_vp7")]
 mod vp7;
 
@@ -23,6 +30,8 @@ mod vp7;
 mod dkadpcm;
 #[cfg(feature="decoder_on2avc")]
 mod on2avc;
+#[cfg(feature="decoder_on2avc")]
+mod on2avcdata;
 
 const DUCK_CODECS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_truemotion1")]
@@ -38,9 +47,11 @@ const DUCK_CODECS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_vp4")]
     DecoderInfo { name: "vp4", get_decoder: vp3::get_decoder_vp4 },
 #[cfg(feature="decoder_vp5")]
-    DecoderInfo { name: "vp5", get_decoder: vp56::get_decoder_vp5 },
+    DecoderInfo { name: "vp5", get_decoder: vp5::get_decoder },
+#[cfg(feature="decoder_vp6")]
+    DecoderInfo { name: "vp6", get_decoder: vp6::get_decoder_vp6 },
 #[cfg(feature="decoder_vp6")]
-    DecoderInfo { name: "vp6", get_decoder: vp56::get_decoder_vp6 },
+    DecoderInfo { name: "vp6a", get_decoder: vp6::get_decoder_vp6_alpha },
 #[cfg(feature="decoder_vp7")]
     DecoderInfo { name: "vp7", get_decoder: vp7::get_decoder },
 
@@ -55,7 +66,7 @@ const DUCK_CODECS: &[DecoderInfo] = &[
 ];
 
 pub fn duck_register_all_codecs(rd: &mut RegisteredDecoders) {
-    for decoder in DUCK_CODECS.into_iter() {
+    for decoder in DUCK_CODECS.iter() {
         rd.add_decoder(decoder.clone());
     }
 }