summaryrefslogtreecommitdiff
path: root/libavcodec/r210enc.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-05-28 19:05:15 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-05-28 19:05:15 +0200
commit5cd947d81b3b6dcfbb1f42e800270a4da5dbbcac (patch)
tree91fd7f7edab1456838f3e76a1974e9a8ee610d5c /libavcodec/r210enc.c
parent77cea13f0521d4c481ab163220017404c1a13f19 (diff)
downloadffmpeg-5cd947d81b3b6dcfbb1f42e800270a4da5dbbcac.tar.gz
Fix r10k codec for widths that are not multiples of 64.
Fixes ticket #1358
Diffstat (limited to 'libavcodec/r210enc.c')
-rw-r--r--libavcodec/r210enc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c
index 92c9ce31f6..0a7dd332ba 100644
--- a/libavcodec/r210enc.c
+++ b/libavcodec/r210enc.c
@@ -38,7 +38,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pic, int *got_packet)
{
int i, j, ret;
- int aligned_width = FFALIGN(avctx->width, 64);
+ int aligned_width = FFALIGN(avctx->width,
+ avctx->codec_id == CODEC_ID_R10K ? 1 : 64);
int pad = (aligned_width - avctx->width) * 4;
uint8_t *src_line;
uint8_t *dst;