diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-10-22 23:03:25 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-10-22 23:03:25 +0000 |
| commit | cccd292ae2928db4825cd5533277f0b101acae79 (patch) | |
| tree | 2964c844f44bcdd793be68e80ca7594f6445a385 | |
| parent | 01537e9fa5d5c129cd9f2ffb4280479796ab3fbe (diff) | |
| download | ffmpeg-cccd292ae2928db4825cd5533277f0b101acae79.tar.gz | |
Move the description field of the filter from AVFilterContext to
AVFilter, where it should have had defined the first time.
+10L.
Originally committed as revision 20356 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavfilter/avfilter.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 18a8b80be1..c66d8f896c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -24,7 +24,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 4 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -406,6 +406,12 @@ typedef struct const AVFilterPad *inputs; ///< NULL terminated list of inputs. NULL if none const AVFilterPad *outputs; ///< NULL terminated list of outputs. NULL if none + + /** + * A description for the filter. You should use the + * NULL_IF_CONFIG_SMALL() macro to define it. + */ + const char *description; } AVFilter; /** An instance of a filter */ @@ -426,12 +432,6 @@ struct AVFilterContext AVFilterLink **outputs; ///< array of pointers to output links void *priv; ///< private data for use by the filter - - /** - * A description for the filter. You should use the - * NULL_IF_CONFIG_SMALL() macro to define it. - */ - const char *description; }; /** |