diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 03:14:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 03:45:10 +0100 |
| commit | 599ae9995f2e66803431e9d87fab2e650f23229e (patch) | |
| tree | fb622ed455f702ebba9d96f556b50a0ae3e991ce | |
| parent | 45326cb68440ed8bfafcba6a903dce53b0000905 (diff) | |
| download | ffmpeg-599ae9995f2e66803431e9d87fab2e650f23229e.tar.gz | |
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>
| -rw-r--r-- | libavcodec/dsputil_template.c | 3 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 3 |
2 files changed, 6 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; diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 3fb9d211b5..e722d8ab62 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1675,6 +1675,9 @@ static av_always_inline void emulated_edge_mc(uint8_t *buf, const uint8_t *src, { int start_y, start_x, end_y, end_x, src_y_add = 0; + if(!w || !h) + return; + if (src_y >= h) { src -= src_y*linesize; src_y_add = h - 1; |