virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 22:24:04 +02:00
Code Issues Releases Activity

Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

Browse Source 
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-10-28 13:07:05 +01:00
parent 252f56636c 5c439b41d0
commit a1ce060c51
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/avfilter.c
View File

@ -457,6 +457,9 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha
static AVFilter *first_filter; static AVFilter *first_filter;
#if !FF_API_NOCONST_GET_NAME
const
#endif
AVFilter *avfilter_get_by_name(const char *name) AVFilter *avfilter_get_by_name(const char *name)
{ {
const AVFilter *f = NULL; const AVFilter *f = NULL;

3
libavfilter/avfilter.h
View File

@ -991,6 +991,9 @@ int avfilter_register(AVFilter *filter);
* @return the filter definition, if any matching one is registered. * @return the filter definition, if any matching one is registered.
* NULL if none found. * NULL if none found.
*/ */
#if !FF_API_NOCONST_GET_NAME
const
#endif
AVFilter *avfilter_get_by_name(const char *name); AVFilter *avfilter_get_by_name(const char *name);
/** /**

3
libavfilter/version.h
View File

@ -85,5 +85,8 @@
#ifndef FF_API_DRAWTEXT_OLD_TIMELINE #ifndef FF_API_DRAWTEXT_OLD_TIMELINE
#define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 4)
#endif #endif
#ifndef FF_API_NOCONST_GET_NAME
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 4)
#endif
#endif /* AVFILTER_VERSION_H */ #endif /* AVFILTER_VERSION_H */