virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Deprecate ff_get_plane_bytewidth() in favor of

Browse Source 
av_get_image_linesize().

Originally committed as revision 24787 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-08-12 15:06:04 +00:00
parent 7906e2b974
commit 81c1ecabab
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/imgconvert.c
View File

@ -794,10 +794,12 @@ void ff_img_copy_plane(uint8_t *dst, int dst_wrap,
} }
} }
#if LIBAVCODEC_VERSION_MAJOR < 53
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)
{ {
return av_get_image_linesize(pix_fmt, width, plane); return av_get_image_linesize(pix_fmt, width, plane);
} }
#endif
void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4], void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
uint8_t *src_data[4], int src_linesize[4], uint8_t *src_data[4], int src_linesize[4],
@ -812,7 +814,7 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
case FF_PIXEL_PLANAR: case FF_PIXEL_PLANAR:
for(i = 0; i < pf->nb_channels; i++) { for(i = 0; i < pf->nb_channels; i++) {
int h; int h;
int bwidth = ff_get_plane_bytewidth(pix_fmt, width, i); int bwidth = av_get_image_linesize(pix_fmt, width, i);
h = height; h = height;
if (i == 1 || i == 2) { if (i == 1 || i == 2) {
h= -((-height)>>desc->log2_chroma_h); h= -((-height)>>desc->log2_chroma_h);

3
libavcodec/imgconvert.h
View File

@ -33,9 +33,10 @@ int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width);
attribute_deprecated 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
attribute_deprecated
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);
#endif
int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt); int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt);

4
libavfilter/avfilter.c
View File

@ -21,8 +21,8 @@
/* #define DEBUG */ /* #define DEBUG */
#include "libavcodec/imgconvert.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavcore/imgutils.h"
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
@ -322,7 +322,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
for(i = 0; i < 4; i ++) { for(i = 0; i < 4; i ++) {
int planew = int planew =
ff_get_plane_bytewidth(link->format, link->cur_buf->video->w, i); av_get_image_linesize(link->format, link->cur_buf->video->w, i);
if(!src[i]) continue; if(!src[i]) continue;

2
libavfilter/avfilter.h
View File

@ -26,7 +26,7 @@
#define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 34 #define LIBAVFILTER_VERSION_MINOR 34
#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_MICRO 1
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \