generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make avfilter_default_get_video_buffer() use functions in

Browse Source 
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
This commit is contained in:
Stefano Sabatini 2010-07-30 00:29:50 +00:00
parent 8fad266101
commit 7be5b7309c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/avfilter.h
View File

@ -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, \

8
libavfilter/defaults.c
View File

@ -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));