History

Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e': avfilter: have avfilter_get_by_name return const for next bump Conflicts: libavfilter/version.h

Michael Niedermayer committed 13 years ago

Commit a1ce0602 parents 252f566 5c439b43 files · +9 −0Browse files

Showing the changes to libavfilter/avfilter.c (1 of 3 files). Show all

Unified · Split

libavfilter/avfilter.c+3−0
@@ -457,6 +457,9 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha · 456 unmodified lines
457 457
458static AVFilter *first_filter;458static AVFilter *first_filter;
459 459
460#if !FF_API_NOCONST_GET_NAME
461const
462#endif
460AVFilter *avfilter_get_by_name(const char *name)463AVFilter *avfilter_get_by_name(const char *name)
461{464{
462 const AVFilter *f = NULL;465 const AVFilter *f = NULL;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t