generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'

Browse Source 
* commit '210461c0a83a5625560fa1d92229200dc7fb869b':
  imgconvert: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-19 05:37:11 +01:00
commit c89751aa21
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/imgconvert.c
View File

@ -378,13 +378,15 @@ static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
deinterlace_line(dst,src_m2,src_m1,src_0,src_0,src_0,width); deinterlace_line(dst,src_m2,src_m1,src_0,src_0,src_0,width);
} }
static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap, static int deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
int width, int height) int width, int height)
{ {
uint8_t *src_m1, *src_0, *src_p1, *src_p2; uint8_t *src_m1, *src_0, *src_p1, *src_p2;
int y; int y;
uint8_t *buf; uint8_t *buf;
buf = av_malloc(width); buf = av_malloc(width);
if (!buf)
return AVERROR(ENOMEM);
src_m1 = src1; src_m1 = src1;
memcpy(buf,src_m1,width); memcpy(buf,src_m1,width);
@ -401,12 +403,13 @@ static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
/* do last line */ /* do last line */
deinterlace_line_inplace(buf,src_m1,src_0,src_0,src_0,width); deinterlace_line_inplace(buf,src_m1,src_0,src_0,src_0,width);
av_free(buf); av_free(buf);
return 0;
} }
int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
enum AVPixelFormat pix_fmt, int width, int height) enum AVPixelFormat pix_fmt, int width, int height)
{ {
int i; int i, ret;
if (pix_fmt != AV_PIX_FMT_YUV420P && if (pix_fmt != AV_PIX_FMT_YUV420P &&
pix_fmt != AV_PIX_FMT_YUVJ420P && pix_fmt != AV_PIX_FMT_YUVJ420P &&
@ -442,8 +445,11 @@ int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
} }
} }
if (src == dst) { if (src == dst) {
deinterlace_bottom_field_inplace(dst->data[i], dst->linesize[i], ret = deinterlace_bottom_field_inplace(dst->data[i],
width, height); dst->linesize[i],
width, height);
if (ret < 0)
return ret;
} else { } else {
deinterlace_bottom_field(dst->data[i],dst->linesize[i], deinterlace_bottom_field(dst->data[i],dst->linesize[i],
src->data[i], src->linesize[i], src->data[i], src->linesize[i],