[FFmpeg-cvslog] lavfi: uninline avfilter_copy_buffer_ref_props().

Anton Khirnov git at videolan.org
Mon May 7 23:06:27 CEST 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon May  7 07:15:06 2012 +0200| [8134fafe9bdda58e24a9574c251ed3a9b5809c51] | committer: Anton Khirnov

lavfi: uninline avfilter_copy_buffer_ref_props().

A nontrivial public function such as this should most certainly NOT be
inline.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8134fafe9bdda58e24a9574c251ed3a9b5809c51
---

 libavfilter/avfilter.c |   13 +++++++++++++
 libavfilter/avfilter.h |   13 +------------
 libavfilter/version.h  |    2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 91eb7f97..d1c82ce 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -707,3 +707,16 @@ int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src)
 
     return 0;
 }
+
+void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src)
+{
+    // copy common properties
+    dst->pts             = src->pts;
+    dst->pos             = src->pos;
+
+    switch (src->type) {
+    case AVMEDIA_TYPE_VIDEO: *dst->video = *src->video; break;
+    case AVMEDIA_TYPE_AUDIO: *dst->audio = *src->audio; break;
+    default: break;
+    }
+}
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 89ab7db..c2049f9 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -145,18 +145,7 @@ typedef struct AVFilterBufferRef {
 /**
  * Copy properties of src to dst, without copying the actual data
  */
-static inline void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src)
-{
-    // copy common properties
-    dst->pts             = src->pts;
-    dst->pos             = src->pos;
-
-    switch (src->type) {
-    case AVMEDIA_TYPE_VIDEO: *dst->video = *src->video; break;
-    case AVMEDIA_TYPE_AUDIO: *dst->audio = *src->audio; break;
-    default: break;
-    }
-}
+void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src);
 
 /**
  * Add a new reference to a buffer.
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 5d646e4..718ed78 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  2
 #define LIBAVFILTER_VERSION_MINOR  16
-#define LIBAVFILTER_VERSION_MICRO  0
+#define LIBAVFILTER_VERSION_MICRO  1
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \



More information about the ffmpeg-cvslog mailing list