RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-13 02:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize,

Browse Source 
and drop the the ff_ variants at the next major bump.

Originally committed as revision 24620 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-07-31 16:46:20 +00:00
parent 93d65e3d92
commit 05236ed735
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/imgconvert.c
View File

@ -498,6 +498,7 @@ int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt){
return 0; return 0;
} }
#if LIBAVCODEC_VERSION_MAJOR < 53
int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width) int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width)
{ {
return av_fill_image_linesizes(picture->linesize, pix_fmt, width); return av_fill_image_linesizes(picture->linesize, pix_fmt, width);
@ -508,6 +509,7 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt,
{ {
return av_fill_image_pointers(picture->data, pix_fmt, height, ptr, picture->linesize); return av_fill_image_pointers(picture->data, pix_fmt, height, ptr, picture->linesize);
} }
#endif
int avpicture_fill(AVPicture *picture, uint8_t *ptr, int avpicture_fill(AVPicture *picture, uint8_t *ptr,
enum PixelFormat pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)

4
libavcodec/imgconvert.h
View File

@ -27,9 +27,13 @@
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
#if LIBAVCODEC_VERSION_MAJOR < 53
attribute_deprecated
int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width); int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width);
attribute_deprecated
int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height); int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height);
#endif
int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);

5
libavcodec/utils.c
View File

@ -29,6 +29,7 @@
#include "libavutil/integer.h" #include "libavutil/integer.h"
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavcore/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "opt.h" #include "opt.h"
@ -284,7 +285,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
do { do {
// NOTE: do not align linesizes individually, this breaks e.g. assumptions // NOTE: do not align linesizes individually, this breaks e.g. assumptions
// that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
ff_fill_linesize(&picture, s->pix_fmt, w); av_fill_image_linesizes(picture.linesize, s->pix_fmt, w);
// increase alignment of w for next try (rhs gives the lowest bit set in w) // increase alignment of w for next try (rhs gives the lowest bit set in w)
w += w & ~(w-1); w += w & ~(w-1);
@ -294,7 +295,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
} }
} while (unaligned); } while (unaligned);
tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h); tmpsize = av_fill_image_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize);
if (tmpsize < 0) if (tmpsize < 0)
return -1; return -1;