Originally committed as revision 24091 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -25,8 +25,8 @@ |
| 25 | 25 |
#include "libavutil/avutil.h" |
| 26 | 26 |
|
| 27 | 27 |
#define LIBAVFILTER_VERSION_MAJOR 1 |
| 28 |
-#define LIBAVFILTER_VERSION_MINOR 20 |
|
| 29 |
-#define LIBAVFILTER_VERSION_MICRO 1 |
|
| 28 |
+#define LIBAVFILTER_VERSION_MINOR 21 |
|
| 29 |
+#define LIBAVFILTER_VERSION_MICRO 0 |
|
| 30 | 30 |
|
| 31 | 31 |
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| 32 | 32 |
LIBAVFILTER_VERSION_MINOR, \ |
| ... | ... |
@@ -121,6 +121,19 @@ typedef struct AVFilterPicRef |
| 121 | 121 |
} AVFilterPicRef; |
| 122 | 122 |
|
| 123 | 123 |
/** |
| 124 |
+ * Copy properties of src to dst, without copying the actual video |
|
| 125 |
+ * data. |
|
| 126 |
+ */ |
|
| 127 |
+static inline void avfilter_copy_picref_props(AVFilterPicRef *dst, AVFilterPicRef *src) |
|
| 128 |
+{
|
|
| 129 |
+ dst->pts = src->pts; |
|
| 130 |
+ dst->pos = src->pos; |
|
| 131 |
+ dst->pixel_aspect = src->pixel_aspect; |
|
| 132 |
+ dst->interlaced = src->interlaced; |
|
| 133 |
+ dst->top_field_first = src->top_field_first; |
|
| 134 |
+} |
|
| 135 |
+ |
|
| 136 |
+/** |
|
| 124 | 137 |
* Add a new reference to a picture. |
| 125 | 138 |
* @param ref an existing reference to the picture |
| 126 | 139 |
* @param pmask a bitmask containing the allowable permissions in the new |