* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e': avfilter: have avfilter_get_by_name return const for next bump Conflicts: libavfilter/version.h
Unified · Split
| @@ -457,6 +457,9 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha · 456 unmodified lines | |||
| 457 | 457 | ||
| 458 | static AVFilter *first_filter; | 458 | static AVFilter *first_filter; |
| 459 | 459 | ||
| 460 | #if !FF_API_NOCONST_GET_NAME | ||
| 461 | const | ||
| 462 | #endif | ||
| 460 | AVFilter *avfilter_get_by_name(const char *name) | 463 | AVFilter *avfilter_get_by_name(const char *name) |
| 461 | { | 464 | { |
| 462 | const AVFilter *f = NULL; | 465 | const AVFilter *f = NULL; |
| @@ -991,6 +991,9 @@ int avfilter_register(AVFilter *filter); · 990 unmodified lines | |||
| 991 | * @return the filter definition, if any matching one is registered. | 991 | * @return the filter definition, if any matching one is registered. |
| 992 | * NULL if none found. | 992 | * NULL if none found. |
| 993 | */ | 993 | */ |
| 994 | #if !FF_API_NOCONST_GET_NAME | ||
| 995 | const | ||
| 996 | #endif | ||
| 994 | AVFilter *avfilter_get_by_name(const char *name); | 997 | AVFilter *avfilter_get_by_name(const char *name); |
| 995 | 998 | ||
| 996 | /** | 999 | /** |
| @@ -85,5 +85,8 @@ · 84 unmodified lines | |||
| 85 | #ifndef FF_API_DRAWTEXT_OLD_TIMELINE | 85 | #ifndef FF_API_DRAWTEXT_OLD_TIMELINE |
| 86 | #define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 4) | 86 | #define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 4) |
| 87 | #endif | 87 | #endif |
| 88 | #ifndef FF_API_NOCONST_GET_NAME | ||
| 89 | #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 4) | ||
| 90 | #endif | ||
| 88 | 91 | ||
| 89 | #endif /* AVFILTER_VERSION_H */ | 92 | #endif /* AVFILTER_VERSION_H */ |