aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dsputil_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-05 03:14:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-05 03:45:10 +0100
commit599ae9995f2e66803431e9d87fab2e650f23229e (patch)
treefb622ed455f702ebba9d96f556b50a0ae3e991ce /libavcodec/dsputil_template.c
parent45326cb68440ed8bfafcba6a903dce53b0000905 (diff)
downloadandroid_external_ffmpeg-599ae9995f2e66803431e9d87fab2e650f23229e.tar.gz
android_external_ffmpeg-599ae9995f2e66803431e9d87fab2e650f23229e.tar.bz2
android_external_ffmpeg-599ae9995f2e66803431e9d87fab2e650f23229e.zip
ff_emulated_edge_mc: fix handling of w/h being 0
Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil_template.c')
-rw-r--r--libavcodec/dsputil_template.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c
index eacf59bd56..2d29cd03e4 100644
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/dsputil_template.c
@@ -130,6 +130,9 @@ void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, int linesize, i
int x, y;
int start_y, start_x, end_y, end_x;
+ if(!w || !h)
+ return;
+
if(src_y>= h){
src-= src_y*linesize;
src+= (h-1)*linesize;