diff options
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 6 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
4 files changed, 3 insertions, 12 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 2da438fb6a..15cf379134 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -18,9 +18,6 @@ API changes, most recent first: 2012-06-05 - xxxxxxx - lavc 54.24.100 Add pkt_duration field to AVFrame. -2012-06-04 - xxxxxxx - lafi 2.78.100 - Add avfilter_default_filter_name() function in avfilter.h. - 2012-05-24 - xxxxxxx - lavu 51.54.100 Move AVPALETTE_SIZE and AVPALETTE_COUNT macros from libavcodec/avcodec.h to libavutil/pixfmt.h. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 98c35ee00f..fb74f26dc2 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -407,7 +407,7 @@ static int pad_count(const AVFilterPad *pads) return count; } -const char *avfilter_default_filter_name(void *filter_ctx) +static char *default_filter_name(void *filter_ctx) { AVFilterContext *ctx = filter_ctx; return ctx->name ? ctx->name : ctx->filter->name; @@ -415,7 +415,7 @@ const char *avfilter_default_filter_name(void *filter_ctx) static const AVClass avfilter_class = { .class_name = "AVFilter", - .item_name = avfilter_default_filter_name, + .item_name = default_filter_name, .version = LIBAVUTIL_VERSION_INT, .category = AV_CLASS_CATEGORY_FILTER, }; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 334a1c104f..17c074fd25 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -621,12 +621,6 @@ struct AVFilterContext { struct AVFilterCommand *command_queue; }; -/** - * Print the name of the filter given a filter context. - */ -const char *avfilter_default_filter_name(void *filter_ctx); - - #if FF_API_PACKING enum AVFilterPacking { AVFILTER_PACKED = 0, diff --git a/libavfilter/version.h b/libavfilter/version.h index 76f649ea01..c90b4ad43a 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 78 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |