Revision 81c1ecab

View differences:

libavcodec/imgconvert.c
794 794
    }
795 795
}
796 796

  
797
#if LIBAVCODEC_VERSION_MAJOR < 53
797 798
int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
798 799
{
799 800
    return av_get_image_linesize(pix_fmt, width, plane);
800 801
}
802
#endif
801 803

  
802 804
void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
803 805
                          uint8_t *src_data[4], int src_linesize[4],
......
812 814
    case FF_PIXEL_PLANAR:
813 815
        for(i = 0; i < pf->nb_channels; i++) {
814 816
            int h;
815
            int bwidth = ff_get_plane_bytewidth(pix_fmt, width, i);
817
            int bwidth = av_get_image_linesize(pix_fmt, width, i);
816 818
            h = height;
817 819
            if (i == 1 || i == 2) {
818 820
                h= -((-height)>>desc->log2_chroma_h);
libavcodec/imgconvert.h
33 33

  
34 34
attribute_deprecated
35 35
int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height);
36
#endif
37 36

  
37
attribute_deprecated
38 38
int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
39
#endif
39 40

  
40 41
int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt);
41 42

  
libavfilter/avfilter.c
21 21

  
22 22
/* #define DEBUG */
23 23

  
24
#include "libavcodec/imgconvert.h"
25 24
#include "libavutil/pixdesc.h"
25
#include "libavcore/imgutils.h"
26 26
#include "avfilter.h"
27 27
#include "internal.h"
28 28

  
......
322 322

  
323 323
        for(i = 0; i < 4; i ++) {
324 324
            int planew =
325
                ff_get_plane_bytewidth(link->format, link->cur_buf->video->w, i);
325
                av_get_image_linesize(link->format, link->cur_buf->video->w, i);
326 326

  
327 327
            if(!src[i]) continue;
328 328

  
libavfilter/avfilter.h
26 26

  
27 27
#define LIBAVFILTER_VERSION_MAJOR  1
28 28
#define LIBAVFILTER_VERSION_MINOR 34
29
#define LIBAVFILTER_VERSION_MICRO  0
29
#define LIBAVFILTER_VERSION_MICRO  1
30 30

  
31 31
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
32 32
                                               LIBAVFILTER_VERSION_MINOR, \

Also available in: Unified diff