diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-08-21 19:12:09 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 22:18:46 +0200 |
| commit | 6e51e746c42607e35e8595bd66a8f50e1d9c40a4 (patch) | |
| tree | 3829b47d6eafee6f0f1d76ec5dddbe0add9eb024 /libavfilter/vidstabutils.c | |
| parent | d2a06242966d7a640d32d304a5653f4e1545f259 (diff) | |
| download | ffmpeg-6e51e746c42607e35e8595bd66a8f50e1d9c40a4.tar.gz | |
vidstab*: Remove accidentally exported av_2_vs_pixel_format()
Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.
Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vidstabutils.c')
| -rw-r--r-- | libavfilter/vidstabutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vidstabutils.c b/libavfilter/vidstabutils.c index 6b0f0c7b91..13544cf573 100644 --- a/libavfilter/vidstabutils.c +++ b/libavfilter/vidstabutils.c @@ -21,7 +21,7 @@ #include "vidstabutils.h" /** convert AV's pixelformat to vid.stab pixelformat */ -VSPixelFormat av_2_vs_pixel_format(AVFilterContext *ctx, enum AVPixelFormat pf) +VSPixelFormat ff_av2vs_pixfmt(AVFilterContext *ctx, enum AVPixelFormat pf) { switch (pf) { case AV_PIX_FMT_YUV420P: return PF_YUV420P; @@ -47,7 +47,7 @@ typedef struct { } VS2AVLogCtx; /** wrapper to log vs_log into av_log */ -static int vs_2_av_log_wrapper(int type, const char *tag, const char *format, ...) +static int vs2av_log(int type, const char *tag, const char *format, ...) { va_list ap; VS2AVLogCtx ctx; @@ -66,7 +66,7 @@ static int vs_2_av_log_wrapper(int type, const char *tag, const char *format, .. } /** sets the memory allocation function and logging constants to av versions */ -void vs_set_mem_and_log_functions(void) +void ff_vs_init(void) { vs_malloc = av_malloc; vs_zalloc = av_mallocz; @@ -78,7 +78,7 @@ void vs_set_mem_and_log_functions(void) VS_INFO_TYPE = AV_LOG_INFO; VS_MSG_TYPE = AV_LOG_VERBOSE; - vs_log = vs_2_av_log_wrapper; + vs_log = vs2av_log; VS_ERROR = 0; VS_OK = 1; |