eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki 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
parent f62dfed3de 7644f5a807
commit 7b91e9cf5d
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/utils.c
View File

@@ -230,12 +230,26 @@ unsigned avcodec_get_edge_width(void)
return EDGE_WIDTH;
}
#if FF_API_SET_DIMENSIONS
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_height = height;
s->width = FF_CEIL_RSHIFT(width, s->lowres);
s->height = FF_CEIL_RSHIFT(height, s->lowres);
return ret;
}
#if HAVE_NEON || ARCH_PPC || HAVE_MMX