Fix compilation with serialize feature

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 3.0.1
+
+- Fix compilation with `serialize` feature and newest `bitflags` crate
+
 ## Version 3.0.0
 
 - [Breaking] remove support for < ffmpeg 4.2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ffmpeg-the-third"
-version = "3.0.0+ffmpeg-7.1"
+version = "3.0.1+ffmpeg-7.1"
 edition = "2021"
 
 authors = ["meh. <[email protected]>", "Zhiming Wang <[email protected]>"]
@@ -20,14 +20,14 @@ rust-version = "1.82.0"
 
 [dependencies]
 libc = "0.2"
-bitflags = "2.7"
+bitflags = "2.8"
 
 [dependencies.image]
 version = "0.25"
 optional = true
 
 [dependencies.ffmpeg-sys-third]
-version = "3.0.0"
+version = "3.0.1"
 default-features = false
 path = "ffmpeg-sys-third"
 
@@ -47,7 +47,7 @@ default = [
     "non-exhaustive-enums",
 ]
 
-serialize = ["serde"]
+serialize = ["serde", "bitflags/serde"]
 static = ["ffmpeg-sys-third/static"]
 
 # mark enums in generated bindings as #[non_exhaustive]

examples/transcode-x264.rs

@@ -55,7 +55,7 @@ impl Transcoder {
         let codec = encoder::find(codec::Id::H264);
         let mut ost = octx.add_stream(codec)?;
 
-        let mut encoder = codec::context::Context::new(codec).encoder().video()?;
+        let mut encoder = codec::context::Context::new_with_codec(codec.unwrap()).encoder().video()?;
         ost.set_parameters_into(&encoder);
         encoder.set_height(decoder.height());
         encoder.set_width(decoder.width());

examples/video-resize.rs

@@ -35,7 +35,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // 创建和配置编码器
     let codec = codec::encoder::find(codec::Id::H264);
-    let mut encoder = codec::context::Context::new(codec).encoder().video()?;
+    let mut encoder = codec::context::Context::new_with_codec(codec.unwrap()).encoder().video()?;
 
     // 设置编码器参数
     encoder.set_height(height);

ffmpeg-sys-third/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ffmpeg-sys-third"
-version = "3.0.0+ffmpeg-7.1"
+version = "3.0.1+ffmpeg-7.1"
 links = "ffmpeg"
 edition = "2021"
 

src/codec/context.rs

@@ -33,20 +33,26 @@ impl Context {
 }
 
 impl Context {
-    pub fn new(codec: Option<Codec>) -> Self {
+    pub fn new() -> Self {
         unsafe {
             Context {
-                ptr: match codec {
-                    Some(c) => avcodec_alloc_context3(c.as_ptr()),
-                    None => avcodec_alloc_context3(ptr::null()),
-                },
+                ptr: avcodec_alloc_context3(ptr::null()),
+                owner: None,
+            }
+        }
+    }
+
+    pub fn new_with_codec(codec: Codec) -> Self {
+        unsafe {
+            Context {
+                ptr: avcodec_alloc_context3(codec.as_ptr()),
                 owner: None,
             }
         }
     }
 
     pub fn from_parameters<P: AsPtr<AVCodecParameters>>(parameters: P) -> Result<Self, Error> {
-        let mut context = Self::new(None);
+        let mut context = Self::new();
 
         unsafe {
             match avcodec_parameters_to_context(context.as_mut_ptr(), parameters.as_ptr()) {
@@ -131,7 +137,7 @@ impl Context {
 
 impl Default for Context {
     fn default() -> Self {
-        Self::new(None)
+        Self::new()
     }
 }
 
@@ -148,7 +154,7 @@ impl Drop for Context {
 #[cfg(not(feature = "ffmpeg_5_0"))]
 impl Clone for Context {
     fn clone(&self) -> Self {
-        let mut ctx = Context::new(None);
+        let mut ctx = Context::new();
         ctx.clone_from(self);
 
         ctx

src/codec/decoder/mod.rs

@@ -29,7 +29,7 @@ use crate::ffi::*;
 use crate::Codec;
 
 pub fn new() -> Decoder {
-    Context::new(None).decoder()
+    Context::new().decoder()
 }
 
 pub fn find(id: Id) -> Option<Codec> {

src/codec/encoder/mod.rs

@@ -32,7 +32,7 @@ use crate::ffi::*;
 use crate::Codec;
 
 pub fn new() -> Encoder {
-    Context::new(None).encoder()
+    Context::new().encoder()
 }
 
 pub fn find(id: Id) -> Option<Codec> {