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

Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'

Browse Source 
* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 13:07:15 +01:00
commit 7b91e9cf5d
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/avcodec.h
View File

@ -4675,7 +4675,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

@ -225,4 +225,10 @@ const uint8_t *avpriv_find_start_code(const uint8_t *p,
const uint8_t *end, const uint8_t *end,
uint32_t *state); uint32_t *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 */

14
libavcodec/utils.c
View File

@ -230,12 +230,26 @@ 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)
{ {
ff_set_dimensions(s, width, height);
}
#endif
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->coded_width = width; s->coded_width = width;
s->coded_height = height; s->coded_height = height;
s->width = FF_CEIL_RSHIFT(width, s->lowres); s->width = FF_CEIL_RSHIFT(width, s->lowres);
s->height = FF_CEIL_RSHIFT(height, s->lowres); s->height = FF_CEIL_RSHIFT(height, s->lowres);
return ret;
} }
#if HAVE_NEON || ARCH_PPC || HAVE_MMX #if HAVE_NEON || ARCH_PPC || HAVE_MMX

3
libavcodec/version.h
View File

@ -100,5 +100,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 */