repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavutil
/
imgutils.c
diff --git
a/ffmpeg/libavutil/imgutils.c
b/ffmpeg/libavutil/imgutils.c
index 00b203182b3418759ced3be3b7beea06e15c0d28..7f3032bdf3fe9f427334afcce8bbc760e51b7454 100644
(file)
--- a/
ffmpeg/libavutil/imgutils.c
+++ b/
ffmpeg/libavutil/imgutils.c
@@
-331,9
+331,6
@@
int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4],
for (i = 0; i < 4; i++)
dst_linesize[i] = FFALIGN(dst_linesize[i], align);
for (i = 0; i < 4; i++)
dst_linesize[i] = FFALIGN(dst_linesize[i], align);
- if ((ret = av_image_fill_pointers(dst_data, pix_fmt, width, NULL, dst_linesize)) < 0)
- return ret;
-
return av_image_fill_pointers(dst_data, pix_fmt, height, (uint8_t *)src, dst_linesize);
}
return av_image_fill_pointers(dst_data, pix_fmt, height, (uint8_t *)src, dst_linesize);
}