comparison avcodec.h @ 12371:5dffb531b1cc libavcodec

Deprecate avcodec_check_dimensions() in favor of the new function av_check_image_size() declared in libavcore/imgutils.h.
author stefano
date Fri, 06 Aug 2010 09:36:45 +0000
parents bfc36c0fea55
children e1ef713061ce
comparison
equal deleted inserted replaced
12370:71b2c440157d 12371:5dffb531b1cc
29 #include <errno.h> 29 #include <errno.h>
30 #include "libavutil/avutil.h" 30 #include "libavutil/avutil.h"
31 31
32 #define LIBAVCODEC_VERSION_MAJOR 52 32 #define LIBAVCODEC_VERSION_MAJOR 52
33 #define LIBAVCODEC_VERSION_MINOR 84 33 #define LIBAVCODEC_VERSION_MINOR 84
34 #define LIBAVCODEC_VERSION_MICRO 2 34 #define LIBAVCODEC_VERSION_MICRO 3
35 35
36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
37 LIBAVCODEC_VERSION_MINOR, \ 37 LIBAVCODEC_VERSION_MINOR, \
38 LIBAVCODEC_VERSION_MICRO) 38 LIBAVCODEC_VERSION_MICRO)
39 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \ 39 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
3390 * according to avcodec_get_edge_width() before. 3390 * according to avcodec_get_edge_width() before.
3391 */ 3391 */
3392 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, 3392 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
3393 int linesize_align[4]); 3393 int linesize_align[4]);
3394 3394
3395 /** 3395 #if LIBAVCODEC_VERSION_MAJOR < 53
3396 * Check if the given dimension of a picture is valid, meaning that all 3396 /**
3397 * bytes of the picture can be addressed with a signed int. 3397 * @deprecated Deprecated in favor of av_check_image_size().
3398 * 3398 */
3399 * @param[in] w Width of the picture. 3399 attribute_deprecated
3400 * @param[in] h Height of the picture.
3401 * @return Zero if valid, a negative value if invalid.
3402 */
3403 int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h); 3400 int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h);
3401 #endif
3402
3404 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt); 3403 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
3405 3404
3406 int avcodec_thread_init(AVCodecContext *s, int thread_count); 3405 int avcodec_thread_init(AVCodecContext *s, int thread_count);
3407 void avcodec_thread_free(AVCodecContext *s); 3406 void avcodec_thread_free(AVCodecContext *s);
3408 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); 3407 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);