diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 21:23:55 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 21:23:55 +0000 |
| commit | 34017fd9b2a2a74f6b985f1ce3c5f66429f034ad (patch) | |
| tree | 45e04064fccb76860adab72bacf12ba108d84ad1 /libavfilter | |
| parent | e7eb2033ffcddfa38457cba96477e15e91fbb4d1 (diff) | |
Move av_picture_data_copy() to libavcore, and rename it
av_image_copy().
Originally committed as revision 25067 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/vsrc_buffer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index bd949ad631..024c8b805d 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,7 +26,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 38 -#define LIBAVFILTER_VERSION_MICRO 2 +#define LIBAVFILTER_VERSION_MICRO 3 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index 03cf5ecdef..12302423b0 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -25,7 +25,7 @@ #include "avfilter.h" #include "vsrc_buffer.h" -#include "libavutil/pixdesc.h" +#include "libavcore/imgutils.h" typedef struct { int64_t pts; @@ -119,7 +119,7 @@ static int request_frame(AVFilterLink *link) AV_PERM_REUSE2, link->w, link->h); - av_picture_data_copy(picref->data, picref->linesize, + av_image_copy(picref->data, picref->linesize, c->frame.data, c->frame.linesize, picref->format, link->w, link->h); |