fix!: remove filter::Context generic lifetime parameter (#194)

issue #193

Co-authored-by: Vincent Jousse <[email protected]>

src/filter/context/context.rs

@@ -1,22 +1,15 @@
-use std::marker::PhantomData;
-
 use super::{Sink, Source};
 use ffi::*;
 use libc::c_void;
 use {format, option, ChannelLayout};
 
-pub struct Context<'a> {
+pub struct Context {
     ptr: *mut AVFilterContext,
-
-    _marker: PhantomData<&'a ()>,
 }
 
-impl<'a> Context<'a> {
+impl Context {
     pub unsafe fn wrap(ptr: *mut AVFilterContext) -> Self {
-        Context {
-            ptr,
-            _marker: PhantomData,
-        }
+        Context { ptr }
     }
 
     pub unsafe fn as_ptr(&self) -> *const AVFilterContext {
@@ -28,12 +21,12 @@ impl<'a> Context<'a> {
     }
 }
 
-impl<'a> Context<'a> {
-    pub fn source(&'a mut self) -> Source<'a> {
+impl Context {
+    pub fn source(&mut self) -> Source {
         unsafe { Source::wrap(self) }
     }
 
-    pub fn sink(&'a mut self) -> Sink<'a> {
+    pub fn sink(&mut self) -> Sink {
         unsafe { Sink::wrap(self) }
     }
 
@@ -61,7 +54,7 @@ impl<'a> Context<'a> {
     }
 }
 
-unsafe impl<'a> option::Target for Context<'a> {
+unsafe impl option::Target for Context {
     fn as_ptr(&self) -> *const c_void {
         self.ptr as *const _
     }
@@ -71,4 +64,4 @@ unsafe impl<'a> option::Target for Context<'a> {
     }
 }
 
-impl<'a> option::Settable for Context<'a> {}
+impl option::Settable for Context {}

src/filter/context/sink.rs

@@ -4,12 +4,12 @@ use libc::c_int;
 use {Error, Frame, Rational};
 
 pub struct Sink<'a> {
-    ctx: &'a mut Context<'a>,
+    ctx: &'a mut Context,
 }
 
 impl<'a> Sink<'a> {
-    pub unsafe fn wrap<'b>(ctx: &'b mut Context<'b>) -> Sink<'b> {
-        Sink { ctx }
+    pub unsafe fn wrap(ctx: &'a mut Context) -> Self {
+        Self { ctx }
     }
 }
 

src/filter/context/source.rs

@@ -5,12 +5,12 @@ use ffi::*;
 use {Error, Frame};
 
 pub struct Source<'a> {
-    ctx: &'a mut Context<'a>,
+    ctx: &'a mut Context,
 }
 
 impl<'a> Source<'a> {
-    pub unsafe fn wrap<'b>(ctx: &'b mut Context<'b>) -> Source<'b> {
-        Source { ctx }
+    pub unsafe fn wrap(ctx: &'a mut Context) -> Self {
+        Self { ctx }
     }
 }
 

src/filter/graph.rs

@@ -50,15 +50,7 @@ impl Graph {
         }
     }
 
-    pub fn add<'a, 'b>(
-        &'a mut self,
-        filter: &Filter,
-        name: &str,
-        args: &str,
-    ) -> Result<Context<'b>, Error>
-    where
-        'a: 'b,
-    {
+    pub fn add(&mut self, filter: &Filter, name: &str, args: &str) -> Result<Context, Error> {
         unsafe {
             let name = CString::new(name).unwrap();
             let args = CString::new(args).unwrap();
@@ -78,10 +70,7 @@ impl Graph {
         }
     }
 
-    pub fn get<'a, 'b>(&'b mut self, name: &str) -> Option<Context<'b>>
-    where
-        'a: 'b,
-    {
+    pub fn get(&mut self, name: &str) -> Option<Context> {
         unsafe {
             let name = CString::new(name).unwrap();
             let ptr = avfilter_graph_get_filter(self.as_mut_ptr(), name.as_ptr());