eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavc: replace avcodec_set_dimensions with ff_set_dimensions

Browse Source 
avcodec_set_dimensions() is supposed to be an internal utility function,
there is no reason whatsoever for it to be public. Therefore deprecate
it.
This commit is contained in:
Anton Khirnov
2013-10-27 09:24:22 +01:00
parent 28096e0a80
commit 7644f5a807
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/avcodec.h
View File

@@ -4028,7 +4028,13 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en
* @} * @}
*/ */
#if FF_API_SET_DIMENSIONS
/**
* @deprecated this function is not supposed to be used from outside of lavc
*/
attribute_deprecated
void avcodec_set_dimensions(AVCodecContext *s, int width, int height); void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
#endif
/** /**
* Put a string representing the codec tag codec_tag in buf. * Put a string representing the codec tag codec_tag in buf.

6
libavcodec/internal.h
View File

@@ -166,4 +166,10 @@ const uint8_t *avpriv_find_start_code(const uint8_t *restrict p,
const uint8_t *end, const uint8_t *end,
uint32_t *restrict state); uint32_t *restrict state);
/**
* Check that the provided frame dimensions are valid and set them on the codec
* context.
*/
int ff_set_dimensions(AVCodecContext *s, int width, int height);
#endif /* AVCODEC_INTERNAL_H */ #endif /* AVCODEC_INTERNAL_H */

19
libavcodec/utils.c
View File

@@ -152,12 +152,23 @@ unsigned avcodec_get_edge_width(void)
return EDGE_WIDTH; return EDGE_WIDTH;
} }
#if FF_API_SET_DIMENSIONS
void avcodec_set_dimensions(AVCodecContext *s, int width, int height) void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
{ {
s->coded_width = width; ff_set_dimensions(s, width, height);
s->coded_height = height; }
s->width = width; #endif
s->height = height;
int ff_set_dimensions(AVCodecContext *s, int width, int height)
{
int ret = av_image_check_size(width, height, 0, s);
if (ret < 0)
width = height = 0;
s->width = s->coded_width = width;
s->height = s->coded_height = height;
return ret;
} }
#if HAVE_NEON || ARCH_PPC || HAVE_MMX #if HAVE_NEON || ARCH_PPC || HAVE_MMX

3
libavcodec/version.h
View File

@@ -73,5 +73,8 @@
#ifndef FF_API_VOXWARE #ifndef FF_API_VOXWARE
#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_SET_DIMENSIONS
#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */