Fix ffmpeg feature flag

crates/store/re_video/Cargo.toml

@@ -27,6 +27,9 @@ features = ["all"]
 [features]
 default = ["av1", "ffmpeg"]
 
+## Native AV1 decoding.
+av1 = ["dep:dav1d"]
+
 ## Decode H.264 using ffmpeg over CLI.
 ffmpeg = ["dep:ffmpeg-sidecar"]
 

crates/viewer/re_renderer/Cargo.toml

@@ -35,13 +35,6 @@ default = ["import-obj", "import-gltf", "import-stl"]
 ## Support for Arrow datatypes for end-to-end zero-copy.
 arrow = ["dep:arrow2"]
 
-<<<<<<< HEAD
-=======
-## Support for native AV1 video decoding.
-## You need to install [nasm](https://nasm.us/) to compile with this feature.
-video_av1 = ["re_video/av1"] # TODO: remove
-
->>>>>>> 4ced5f84a4 (Actual H.264 video playback inside of Rerun viewer)
 ## Support importing .obj files
 import-obj = ["dep:tobj"]