diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-30 00:29:50 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-30 00:29:50 +0000 |
| commit | 7be5b7309c251c876e9b81ad51311600eb858d74 (patch) | |
| tree | 3f019c61e63fcf19010ce466dce05dd85f694d66 /libavfilter | |
| parent | 8fad26610193efeb3a4076329ee616a29c0f837d (diff) | |
| download | ffmpeg-7be5b7309c251c876e9b81ad51311600eb858d74.tar.gz | |
Make avfilter_default_get_video_buffer() use functions in
libavcore/imgutils.c rather than ff_fill_linesize() and
ff_fill_pointer().
Also remove a dependency on libavcodec.
Originally committed as revision 24586 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/defaults.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index e945a07bd8..7d639cfe3b 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,7 +26,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 26 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MICRO 2 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 27c8a3bcdc..8deef93fe6 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/imgconvert.h" +#include "libavcore/imgutils.h" #include "avfilter.h" /* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */ @@ -49,15 +49,15 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, pic->refcount = 1; pic->format = link->format; pic->free = avfilter_default_free_buffer; - ff_fill_linesize((AVPicture *)pic, pic->format, ref->w); + av_fill_image_linesizes(pic->linesize, pic->format, ref->w); for (i=0; i<4;i++) pic->linesize[i] = FFALIGN(pic->linesize[i], 16); - tempsize = ff_fill_pointer((AVPicture *)pic, NULL, pic->format, ref->h); + tempsize = av_fill_image_pointers(pic->data, pic->format, ref->h, NULL, pic->linesize); buf = av_malloc(tempsize + 16); // +2 is needed for swscaler, +16 to be // SIMD-friendly - ff_fill_pointer((AVPicture *)pic, buf, pic->format, ref->h); + av_fill_image_pointers(pic->data, pic->format, ref->h, buf, pic->linesize); memcpy(ref->data, pic->data, sizeof(pic->data)); memcpy(ref->linesize, pic->linesize, sizeof(pic->linesize)); |