[vlc-commits] decoder: move decoder_UpdateVideoFormat() into a function

Steve Lhomme git at videolan.org
Mon Feb 18 17:02:52 CET 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Feb 18 15:27:42 2019 +0100| [cf3deae58438879e665391e8b6620ae0b2cbec93] | committer: Steve Lhomme

decoder: move decoder_UpdateVideoFormat() into a function

It is going to do a lot more in push with the video context.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cf3deae58438879e665391e8b6620ae0b2cbec93
---

 include/vlc_codec.h         | 11 +----------
 src/input/decoder_helpers.c |  9 +++++++++
 src/libvlccore.sym          |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index f8d8948e3e..8d5bcf94c7 100644
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -267,16 +267,7 @@ struct encoder_t
  *
  * @return 0 if the video output was set up successfully, -1 otherwise.
  */
-VLC_USED
-static inline int decoder_UpdateVideoFormat( decoder_t *dec )
-{
-    vlc_assert( dec->fmt_in.i_cat == VIDEO_ES && dec->cbs != NULL );
-
-    if( dec->fmt_in.i_cat == VIDEO_ES && dec->cbs->video.format_update != NULL )
-        return dec->cbs->video.format_update( dec );
-    else
-        return -1;
-}
+VLC_API int decoder_UpdateVideoFormat( decoder_t *dec );
 
 /**
  * Allocates an output picture buffer.
diff --git a/src/input/decoder_helpers.c b/src/input/decoder_helpers.c
index 91bdf6a123..c9106c70c3 100644
--- a/src/input/decoder_helpers.c
+++ b/src/input/decoder_helpers.c
@@ -71,3 +71,12 @@ void decoder_Destroy( decoder_t *p_dec )
         vlc_object_release( p_dec );
     }
 }
+
+int decoder_UpdateVideoFormat( decoder_t *dec )
+{
+    vlc_assert( dec->fmt_in.i_cat == VIDEO_ES && dec->cbs != NULL );
+
+    if( dec->fmt_in.i_cat == VIDEO_ES && dec->cbs->video.format_update != NULL )
+        return dec->cbs->video.format_update( dec );
+    return -1;
+}
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index d2d1dac6fb..3f8ca498de 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -78,6 +78,7 @@ decoder_Clean
 decoder_Destroy
 decoder_AbortPictures
 decoder_NewAudioBuffer
+decoder_UpdateVideoFormat
 demux_PacketizerDestroy
 demux_PacketizerNew
 demux_New



More information about the vlc-commits mailing list