diff --git a/src/any.rs b/src/any.rs
index 913553f..caa680e 100644
--- a/src/any.rs
+++ b/src/any.rs
@@ -279,7 +279,7 @@ any! {
                                 Pasp,
                                 Taic,
                                 Fiel,
-                            Hev1, Hvc1,
+                            Hev1, Hvc1, Hev2, Hvc2,
                                 Hvcc,
                             Mp4a,
                                 Esds,
diff --git a/src/moov/trak/mdia/minf/stbl/stsd/hevc/hev1.rs b/src/moov/trak/mdia/minf/stbl/stsd/hevc/hev1.rs
deleted file mode 100644
index 1d01afe..0000000
--- a/src/moov/trak/mdia/minf/stbl/stsd/hevc/hev1.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use crate::*;
-
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct Hev1 {
-    pub visual: Visual,
-    pub hvcc: Hvcc,
-    pub btrt: Option<Btrt>,
-    pub colr: Option<Colr>,
-    pub pasp: Option<Pasp>,
-    pub taic: Option<Taic>,
-    pub fiel: Option<Fiel>,
-}
-
-impl Atom for Hev1 {
-    const KIND: FourCC = FourCC::new(b"hev1");
-
-    fn decode_body<B: Buf>(buf: &mut B) -> Result<Self> {
-        let visual = Visual::decode(buf)?;
-
-        let mut hvcc = None;
-        let mut btrt = None;
-        let mut colr = None;
-        let mut pasp = None;
-        let mut taic = None;
-        let mut fiel = None;
-        while let Some(atom) = Any::decode_maybe(buf)? {
-            match atom {
-                Any::Hvcc(atom) => hvcc = atom.into(),
-                Any::Btrt(atom) => btrt = atom.into(),
-                Any::Colr(atom) => colr = atom.into(),
-                Any::Pasp(atom) => pasp = atom.into(),
-                Any::Taic(atom) => taic = atom.into(),
-                Any::Fiel(atom) => fiel = atom.into(),
-                unknown => Self::decode_unknown(&unknown)?,
-            }
-        }
-
-        Ok(Hev1 {
-            visual,
-            hvcc: hvcc.ok_or(Error::MissingBox(Hvcc::KIND))?,
-            btrt,
-            colr,
-            pasp,
-            taic,
-            fiel,
-        })
-    }
-
-    fn encode_body<B: BufMut>(&self, buf: &mut B) -> Result<()> {
-        self.visual.encode(buf)?;
-        self.hvcc.encode(buf)?;
-        self.btrt.encode(buf)?;
-        self.colr.encode(buf)?;
-        self.pasp.encode(buf)?;
-        self.taic.encode(buf)?;
-        self.fiel.encode(buf)?;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_hev1() {
-        let expected = Hev1 {
-            visual: Visual {
-                data_reference_index: 1,
-                width: 320,
-                height: 240,
-                horizresolution: 0x48.into(),
-                vertresolution: 0x48.into(),
-                frame_count: 1,
-                compressor: "ya boy".into(),
-                depth: 24,
-            },
-            hvcc: Hvcc {
-                configuration_version: 1,
-                ..Default::default()
-            },
-            btrt: None,
-            colr: None,
-            pasp: None,
-            taic: None,
-            fiel: None,
-        };
-        let mut buf = Vec::new();
-        expected.encode(&mut buf).unwrap();
-
-        let mut buf = buf.as_ref();
-        let decoded = Hev1::decode(&mut buf).unwrap();
-        assert_eq!(decoded, expected);
-    }
-}
diff --git a/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvc1.rs b/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvc1.rs
index 9991344..079d6d7 100644
--- a/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvc1.rs
+++ b/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvc1.rs
@@ -1,69 +1,81 @@
 use crate::*;
 
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct Hvc1 {
-    pub visual: Visual,
-    pub hvcc: Hvcc,
-    // TODO support SPS/PPS/VPS atoms
-    pub btrt: Option<Btrt>,
-    pub colr: Option<Colr>,
-    pub pasp: Option<Pasp>,
-    pub taic: Option<Taic>,
-    pub fiel: Option<Fiel>,
-    pub ccst: Option<Ccst>,
-}
+macro_rules! define_hevc_sample_entry {
+    ($name:ident, $fourcc:expr) => {
+        #[derive(Debug, Clone, PartialEq, Eq, Default)]
+        #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+        pub struct $name {
+            pub visual: Visual,
+            pub hvcc: Hvcc,
+            // TODO support SPS/PPS/VPS atoms
+            pub btrt: Option<Btrt>,
+            pub colr: Option<Colr>,
+            pub pasp: Option<Pasp>,
+            pub taic: Option<Taic>,
+            pub fiel: Option<Fiel>,
+            pub ccst: Option<Ccst>,
+        }
+
+        impl Atom for $name {
+            const KIND: FourCC = FourCC::new($fourcc);
+
+            fn decode_body<B: Buf>(buf: &mut B) -> Result<Self> {
+                let visual = Visual::decode(buf)?;
+
+                let mut hvcc = None;
+                let mut btrt = None;
+                let mut colr = None;
+                let mut pasp = None;
+                let mut taic = None;
+                let mut fiel = None;
+                let mut ccst = None;
+                while let Some(atom) = Any::decode_maybe(buf)? {
+                    match atom {
+                        Any::Hvcc(atom) => hvcc = atom.into(),
+                        Any::Btrt(atom) => btrt = atom.into(),
+                        Any::Colr(atom) => colr = atom.into(),
+                        Any::Pasp(atom) => pasp = atom.into(),
+                        Any::Taic(atom) => taic = atom.into(),
+                        Any::Fiel(atom) => fiel = atom.into(),
+                        Any::Ccst(atom) => ccst = atom.into(),
+                        unknown => Self::decode_unknown(&unknown)?,
+                    }
+                }
+
+                Ok(Self {
+                    visual,
+                    hvcc: hvcc.ok_or(Error::MissingBox(Hvcc::KIND))?,
+                    btrt,
+                    colr,
+                    pasp,
+                    taic,
+                    fiel,
+                    ccst,
+                })
+            }
 
-impl Atom for Hvc1 {
-    const KIND: FourCC = FourCC::new(b"hvc1");
-
-    fn decode_body<B: Buf>(buf: &mut B) -> Result<Self> {
-        let visual = Visual::decode(buf)?;
-
-        let mut hvcc = None;
-        let mut btrt = None;
-        let mut colr = None;
-        let mut pasp = None;
-        let mut taic = None;
-        let mut fiel = None;
-        let mut ccst = None;
-        while let Some(atom) = Any::decode_maybe(buf)? {
-            match atom {
-                Any::Hvcc(atom) => hvcc = atom.into(),
-                Any::Btrt(atom) => btrt = atom.into(),
-                Any::Colr(atom) => colr = atom.into(),
-                Any::Pasp(atom) => pasp = atom.into(),
-                Any::Taic(atom) => taic = atom.into(),
-                Any::Fiel(atom) => fiel = atom.into(),
-                Any::Ccst(atom) => ccst = atom.into(),
-                unknown => Self::decode_unknown(&unknown)?,
+            fn encode_body<B: BufMut>(&self, buf: &mut B) -> Result<()> {
+                self.visual.encode(buf)?;
+                self.hvcc.encode(buf)?;
+                self.btrt.encode(buf)?;
+                self.colr.encode(buf)?;
+                self.pasp.encode(buf)?;
+                self.taic.encode(buf)?;
+                self.fiel.encode(buf)?;
+                self.ccst.encode(buf)?;
+                Ok(())
             }
         }
+    };
+}
 
-        Ok(Self {
-            visual,
-            hvcc: hvcc.ok_or(Error::MissingBox(Hvcc::KIND))?,
-            btrt,
-            colr,
-            pasp,
-            taic,
-            fiel,
-            ccst,
-        })
-    }
+define_hevc_sample_entry!(Hvc1, b"hvc1");
 
-    fn encode_body<B: BufMut>(&self, buf: &mut B) -> Result<()> {
-        self.visual.encode(buf)?;
-        self.hvcc.encode(buf)?;
-        self.btrt.encode(buf)?;
-        self.colr.encode(buf)?;
-        self.pasp.encode(buf)?;
-        self.taic.encode(buf)?;
-        self.fiel.encode(buf)?;
-        self.ccst.encode(buf)?;
-        Ok(())
-    }
-}
+define_hevc_sample_entry!(Hvc2, b"hvc2");
+
+define_hevc_sample_entry!(Hev1, b"hev1");
+
+define_hevc_sample_entry!(Hev2, b"hev2");
 
 #[cfg(test)]
 mod tests {
@@ -165,4 +177,210 @@ mod tests {
         hvc1.encode(&mut encoded).expect("failed to encode hvc1");
         assert_eq!(encoded, ENCODED_HVC1_HEIF);
     }
+
+    #[test]
+    fn test_hev1() {
+        let expected = Hev1 {
+            visual: Visual {
+                data_reference_index: 1,
+                width: 320,
+                height: 240,
+                horizresolution: 0x48.into(),
+                vertresolution: 0x48.into(),
+                frame_count: 1,
+                compressor: "ya boy".into(),
+                depth: 24,
+            },
+            hvcc: Hvcc {
+                configuration_version: 1,
+                ..Default::default()
+            },
+            btrt: None,
+            colr: None,
+            pasp: None,
+            taic: None,
+            fiel: None,
+            ccst: None,
+        };
+        let mut buf = Vec::new();
+        expected.encode(&mut buf).unwrap();
+
+        let mut buf = buf.as_ref();
+        let decoded = Hev1::decode(&mut buf).unwrap();
+        assert_eq!(decoded, expected);
+    }
+
+    // From MPEG file format conformance: nalu/hevc/hevc_hvc1_hvc2_implicit.mp4
+    const ENCODED_HVC2: &[u8] = &[
+        0x00, 0x00, 0x00, 0xef, 0x68, 0x76, 0x63, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x05, 0x00, 0x02, 0xd0, 0x00, 0x48, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 0x85,
+        0x68, 0x76, 0x63, 0x43, 0x01, 0x01, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x5d, 0xf0, 0x00, 0xfd, 0xfd, 0xf8, 0xf8, 0x00, 0x00, 0x13, 0x03, 0xa0, 0x00, 0x01,
+        0x00, 0x1c, 0x40, 0x01, 0x0c, 0x02, 0xff, 0xff, 0x01, 0x60, 0x00, 0x00, 0x03, 0x00, 0x00,
+        0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x5d, 0x00, 0x00, 0x95, 0xca, 0x48, 0x12,
+        0xa1, 0x00, 0x01, 0x00, 0x34, 0x42, 0x01, 0x02, 0x01, 0x60, 0x00, 0x00, 0x03, 0x00, 0x00,
+        0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x5d, 0x00, 0x00, 0xa0, 0x02, 0x80, 0x80,
+        0x2d, 0x1f, 0xe5, 0x95, 0xca, 0x4c, 0x92, 0x36, 0xc3, 0x4b, 0x11, 0x55, 0x26, 0x26, 0x19,
+        0x7d, 0x9f, 0x5e, 0x6f, 0xcb, 0x3e, 0xbc, 0x28, 0x8c, 0x4e, 0x5d, 0xb2, 0xa2, 0x00, 0x01,
+        0x00, 0x07, 0x44, 0x01, 0xc1, 0xa5, 0x58, 0x11, 0x20, 0x00, 0x00, 0x00, 0x14, 0x62, 0x74,
+        0x72, 0x74, 0x00, 0x00, 0x38, 0xd8, 0x00, 0x07, 0xa1, 0x78, 0x00, 0x06, 0x3e, 0x68,
+    ];
+
+    #[test]
+    fn test_hvc2() {
+        let mut buf = std::io::Cursor::new(ENCODED_HVC2);
+
+        let hvc = Hvc2::decode(&mut buf).expect("failed to decode hvc2");
+
+        assert_eq!(
+            hvc,
+            Hvc2 {
+                visual: Visual {
+                    data_reference_index: 1,
+                    width: 1280,
+                    height: 720,
+                    horizresolution: 72.into(),
+                    vertresolution: 72.into(),
+                    frame_count: 1,
+                    compressor: "".into(),
+                    depth: 24
+                },
+                hvcc: Hvcc {
+                    configuration_version: 1,
+                    general_profile_space: 0,
+                    general_tier_flag: false,
+                    general_profile_idc: 1,
+                    general_profile_compatibility_flags: [0x60, 0x00, 0x00, 0x00],
+                    general_constraint_indicator_flags: [0, 0, 0, 0, 0, 0],
+                    general_level_idc: 93,
+                    min_spatial_segmentation_idc: 0,
+                    parallelism_type: 1,
+                    chroma_format_idc: 1,
+                    bit_depth_luma_minus8: 0,
+                    bit_depth_chroma_minus8: 0,
+                    avg_frame_rate: 0,
+                    constant_frame_rate: 0,
+                    num_temporal_layers: 2,
+                    temporal_id_nested: false,
+                    length_size_minus_one: 3,
+                    arrays: vec![
+                        HvcCArray {
+                            completeness: true,
+                            nal_unit_type: 32,
+                            nalus: vec![vec![
+                                0x40, 0x01, 0x0C, 0x02, 0xFF, 0xFF, 0x01, 0x60, 0x00, 0x00, 0x03,
+                                0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x5D,
+                                0x00, 0x00, 0x95, 0xCA, 0x48, 0x12
+                            ]]
+                        },
+                        HvcCArray {
+                            completeness: true,
+                            nal_unit_type: 33,
+                            nalus: vec![vec![
+                                0x42, 0x01, 0x02, 0x01, 0x60, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03,
+                                0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x5D, 0x00, 0x00, 0xA0,
+                                0x02, 0x80, 0x80, 0x2D, 0x1F, 0xE5, 0x95, 0xCA, 0x4C, 0x92, 0x36,
+                                0xC3, 0x4B, 0x11, 0x55, 0x26, 0x26, 0x19, 0x7D, 0x9F, 0x5E, 0x6F,
+                                0xCB, 0x3E, 0xBC, 0x28, 0x8C, 0x4E, 0x5D, 0xB2
+                            ]]
+                        },
+                        HvcCArray {
+                            completeness: true,
+                            nal_unit_type: 34,
+                            nalus: vec![vec![0x44, 0x01, 0xC1, 0xA5, 0x58, 0x11, 0x20]]
+                        }
+                    ]
+                },
+                btrt: Some(Btrt {
+                    buffer_size_db: 14552,
+                    max_bitrate: 500088,
+                    avg_bitrate: 409192
+                }),
+                colr: None,
+                pasp: None,
+                taic: None,
+                fiel: None,
+                ccst: None,
+            }
+        );
+
+        let mut encoded = Vec::new();
+        hvc.encode(&mut encoded).expect("failed to encode hvc2");
+        assert_eq!(encoded, ENCODED_HVC2);
+    }
+
+    // From MPEG file format conformance: nalu/hevc/hevc_hev1_hev2_extractors.mp4
+    const ENCODED_HEV2: &[u8] = &[
+        0x00, 0x00, 0x00, 0x89, 0x68, 0x65, 0x76, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x05, 0x00, 0x02, 0xd0, 0x00, 0x48, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1f,
+        0x68, 0x76, 0x63, 0x43, 0x01, 0x01, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x5d, 0xf0, 0x00, 0xfd, 0xfd, 0xf8, 0xf8, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00,
+        0x14, 0x62, 0x74, 0x72, 0x74, 0x00, 0x00, 0x39, 0x3b, 0x00, 0x07, 0xa7, 0xa8, 0x00, 0x06,
+        0x41, 0xd0,
+    ];
+
+    #[test]
+    fn test_hev2() {
+        let mut buf = std::io::Cursor::new(ENCODED_HEV2);
+
+        let hev2 = Hev2::decode(&mut buf).expect("failed to decode hev2");
+
+        assert_eq!(
+            hev2,
+            Hev2 {
+                visual: Visual {
+                    data_reference_index: 1,
+                    width: 1280,
+                    height: 720,
+                    horizresolution: 72.into(),
+                    vertresolution: 72.into(),
+                    frame_count: 1,
+                    compressor: "".into(),
+                    depth: 24
+                },
+                hvcc: Hvcc {
+                    configuration_version: 1,
+                    general_profile_space: 0,
+                    general_tier_flag: false,
+                    general_profile_idc: 1,
+                    general_profile_compatibility_flags: [0x60, 0x00, 0x00, 0x00],
+                    general_constraint_indicator_flags: [0, 0, 0, 0, 0, 0],
+                    general_level_idc: 93,
+                    min_spatial_segmentation_idc: 0,
+                    parallelism_type: 1,
+                    chroma_format_idc: 1,
+                    bit_depth_luma_minus8: 0,
+                    bit_depth_chroma_minus8: 0,
+                    avg_frame_rate: 0,
+                    constant_frame_rate: 0,
+                    num_temporal_layers: 2,
+                    temporal_id_nested: false,
+                    length_size_minus_one: 3,
+                    arrays: vec![]
+                },
+                btrt: Some(Btrt {
+                    buffer_size_db: 14651,
+                    max_bitrate: 501672,
+                    avg_bitrate: 410064
+                }),
+                colr: None,
+                pasp: None,
+                taic: None,
+                fiel: None,
+                ccst: None,
+            }
+        );
+
+        let mut encoded = Vec::new();
+        hev2.encode(&mut encoded).expect("failed to encode hev2");
+        assert_eq!(encoded, ENCODED_HEV2);
+    }
 }
diff --git a/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvcc.rs b/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvcc.rs
index f242c6c..50e3adc 100644
--- a/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvcc.rs
+++ b/src/moov/trak/mdia/minf/stbl/stsd/hevc/hvcc.rs
@@ -174,6 +174,7 @@ mod tests {
             pasp: None,
             taic: None,
             fiel: None,
+            ccst: None,
         };
         let mut buf = Vec::new();
         expected.encode(&mut buf).unwrap();
diff --git a/src/moov/trak/mdia/minf/stbl/stsd/hevc/mod.rs b/src/moov/trak/mdia/minf/stbl/stsd/hevc/mod.rs
index 58bd9b6..60a5411 100644
--- a/src/moov/trak/mdia/minf/stbl/stsd/hevc/mod.rs
+++ b/src/moov/trak/mdia/minf/stbl/stsd/hevc/mod.rs
@@ -1,7 +1,5 @@
-mod hev1;
 mod hvc1;
 mod hvcc;
 
-pub use hev1::*;
 pub use hvc1::*;
 pub use hvcc::*;
diff --git a/src/test/hevc.rs b/src/test/hevc.rs
index a1b9c36..1b234dd 100644
--- a/src/test/hevc.rs
+++ b/src/test/hevc.rs
@@ -374,6 +374,7 @@ fn hevc() {
                                         field_count: 1,
                                         field_order: 0
                                     }),
+                                    ccst: None,
                                 }
                                 .into()],
                             },