Originally committed as revision 20356 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | |
| 25 | 25 | #define LIBAVFILTER_VERSION_MAJOR 1 |
| 26 | 26 | #define LIBAVFILTER_VERSION_MINOR 4 |
| 27 | −#define LIBAVFILTER_VERSION_MICRO 0 | |
| 27 | +#define LIBAVFILTER_VERSION_MICRO 1 | |
| 28 | 28 | |
| 29 | 29 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| 30 | 30 | LIBAVFILTER_VERSION_MINOR, \ |
| @@ -406,6 +406,12 @@ typedef struct · 375 unmodified lines | ||
| 406 | 406 | |
| 407 | 407 | const AVFilterPad *inputs; ///< NULL terminated list of inputs. NULL if none |
| 408 | 408 | const AVFilterPad *outputs; ///< NULL terminated list of outputs. NULL if none |
| 409 | + | |
| 410 | + /** | |
| 411 | + * A description for the filter. You should use the | |
| 412 | + * NULL_IF_CONFIG_SMALL() macro to define it. | |
| 413 | + */ | |
| 414 | + const char *description; | |
| 409 | 415 | } AVFilter; |
| 410 | 416 | |
| 411 | 417 | /** An instance of a filter */ |
| @@ -426,12 +432,6 @@ struct AVFilterContext · 14 unmodified lines | ||
| 426 | 432 | AVFilterLink **outputs; ///< array of pointers to output links |
| 427 | 433 | |
| 428 | 434 | void *priv; ///< private data for use by the filter |
| 429 | − | |
| 430 | − /** | |
| 431 | − * A description for the filter. You should use the | |
| 432 | − * NULL_IF_CONFIG_SMALL() macro to define it. | |
| 433 | − */ | |
| 434 | − const char *description; | |
| 435 | 435 | }; |
| 436 | 436 | |
| 437 | 437 | /** |