diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-22 23:07:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-22 23:34:53 +0100 |
| commit | 7517e932ffacdc99d34239f86314b376ffb63726 (patch) | |
| tree | f676ffc8c822bbb4655da7ac755e55cf96c46456 /libavcodec/snowenc.c | |
| parent | a089d567f10e45ac3501f1f9741077a5df401859 (diff) | |
| download | ffmpeg-7517e932ffacdc99d34239f86314b376ffb63726.tar.gz | |
avcodec/snow: fix support for odd dimensions
Fixes Ticket3914
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snowenc.c')
| -rw-r--r-- | libavcodec/snowenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 544efbfb9e..e03dc136d5 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1565,12 +1565,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, for(i=0; i < s->nb_planes; i++){ int hshift= i ? s->chroma_h_shift : 0; int vshift= i ? s->chroma_v_shift : 0; - for(y=0; y<(height>>vshift); y++) + for(y=0; y<FF_CEIL_RSHIFT(height, vshift); y++) memcpy(&s->input_picture->data[i][y * s->input_picture->linesize[i]], &pict->data[i][y * pict->linesize[i]], - width>>hshift); + FF_CEIL_RSHIFT(width, hshift)); s->mpvencdsp.draw_edges(s->input_picture->data[i], s->input_picture->linesize[i], - width >> hshift, height >> vshift, + FF_CEIL_RSHIFT(width, hshift), FF_CEIL_RSHIFT(height, vshift), EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift, EDGE_TOP | EDGE_BOTTOM); |