comparison avcodec.h @ 12469:9471234fb8ea libavcodec

Move av_picture_data_copy() to libavcore, and rename it av_image_copy().
author stefano
date Tue, 07 Sep 2010 21:23:55 +0000
parents 0a306a267dbf
children 9fef0a8ddd63
comparison
equal deleted inserted replaced
12468:443f38ceeaad 12469:9471234fb8ea
30 #include "libavutil/avutil.h" 30 #include "libavutil/avutil.h"
31 #include "libavutil/cpu.h" 31 #include "libavutil/cpu.h"
32 32
33 #define LIBAVCODEC_VERSION_MAJOR 52 33 #define LIBAVCODEC_VERSION_MAJOR 52
34 #define LIBAVCODEC_VERSION_MINOR 87 34 #define LIBAVCODEC_VERSION_MINOR 87
35 #define LIBAVCODEC_VERSION_MICRO 3 35 #define LIBAVCODEC_VERSION_MICRO 4
36 36
37 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 37 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
38 LIBAVCODEC_VERSION_MINOR, \ 38 LIBAVCODEC_VERSION_MINOR, \
39 LIBAVCODEC_VERSION_MICRO) 39 LIBAVCODEC_VERSION_MICRO)
40 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \ 40 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
3948 * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and 3948 * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
3949 * *size 0 if an error occurred. 3949 * *size 0 if an error occurred.
3950 */ 3950 */
3951 void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size); 3951 void av_fast_malloc(void *ptr, unsigned int *size, unsigned int min_size);
3952 3952
3953 /** 3953 #if LIBAVCODEC_VERSION_MAJOR < 53
3954 * Copy image data in src_data to dst_data. 3954 /**
3955 * 3955 * @deprecated Deprecated in favor of av_image_copy().
3956 * @param dst_linesize linesizes for the image in dst_data 3956 */
3957 * @param src_linesize linesizes for the image in src_data 3957 attribute_deprecated
3958 */
3959 void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4], 3958 void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
3960 uint8_t *src_data[4], int src_linesize[4], 3959 uint8_t *src_data[4], int src_linesize[4],
3961 enum PixelFormat pix_fmt, int width, int height); 3960 enum PixelFormat pix_fmt, int width, int height);
3961 #endif
3962 3962
3963 /** 3963 /**
3964 * Copy image src to dst. Wraps av_picture_data_copy() above. 3964 * Copy image src to dst. Wraps av_picture_data_copy() above.
3965 */ 3965 */
3966 void av_picture_copy(AVPicture *dst, const AVPicture *src, 3966 void av_picture_copy(AVPicture *dst, const AVPicture *src,