diff --git a/src/util/color/primaries.rs b/src/util/color/primaries.rs
index d3a1967..f6fced6 100644
--- a/src/util/color/primaries.rs
+++ b/src/util/color/primaries.rs
@@ -31,11 +31,7 @@ impl Primaries {
         }
         unsafe {
             let ptr = av_color_primaries_name((*self).into());
-            if ptr.is_null() {
-                None
-            } else {
-                Some(from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
-            }
+            ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
         }
     }
 }
diff --git a/src/util/color/range.rs b/src/util/color/range.rs
index 689a410..678f830 100644
--- a/src/util/color/range.rs
+++ b/src/util/color/range.rs
@@ -18,11 +18,7 @@ impl Range {
         }
         unsafe {
             let ptr = av_color_range_name((*self).into());
-            if ptr.is_null() {
-                None
-            } else {
-                Some(from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
-            }
+            ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
         }
     }
 }
diff --git a/src/util/color/space.rs b/src/util/color/space.rs
index ddcdd93..ecee6be 100644
--- a/src/util/color/space.rs
+++ b/src/util/color/space.rs
@@ -32,11 +32,7 @@ impl Space {
         }
         unsafe {
             let ptr = av_color_space_name((*self).into());
-            if ptr.is_null() {
-                None
-            } else {
-                Some(from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
-            }
+            ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
         }
     }
 }
diff --git a/src/util/color/transfer_characteristic.rs b/src/util/color/transfer_characteristic.rs
index df3b053..bc18fe5 100644
--- a/src/util/color/transfer_characteristic.rs
+++ b/src/util/color/transfer_characteristic.rs
@@ -34,11 +34,7 @@ impl TransferCharacteristic {
         }
         unsafe {
             let ptr = av_color_transfer_name((*self).into());
-            if ptr.is_null() {
-                None
-            } else {
-                Some(from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
-            }
+            ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes()))
         }
     }
 }