diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-05-07 07:15:06 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-05-07 14:23:36 +0200 |
| commit | 8134fafe9bdda58e24a9574c251ed3a9b5809c51 (patch) | |
| tree | 0fbb85b7b5d2feeab3657bc52a350a814f57da2c | |
| parent | 1432c1c429fb4817ca0d309096ea40a9d03c1035 (diff) | |
| download | ffmpeg-8134fafe9bdda58e24a9574c251ed3a9b5809c51.tar.gz | |
lavfi: uninline avfilter_copy_buffer_ref_props().
A nontrivial public function such as this should most certainly NOT be
inline.
| -rw-r--r-- | libavfilter/avfilter.c | 13 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 13 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 91eb7f97cf..d1c82cee2f 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 89ab7dbe2a..c2049f98fe 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 5d646e4f86..718ed7812e 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, \ |