aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-02-06 17:54:39 +0000
committerAnton Khirnov <anton@khirnov.net>2012-02-06 19:57:52 +0100
commitd016d3074cc084ea813e389f046eee01ecd48b7e (patch)
tree9d312ff3ba64d8333574b2e6a9c94eb5b4709d6a /libavcodec
parent32f3c541bcddd1313212792c78c5ae643570b904 (diff)
downloadffmpeg-d016d3074cc084ea813e389f046eee01ecd48b7e.tar.gz
Revert "v210enc: use FFALIGN()"
FFALIGN doesn't work with non-powers-of-2. This reverts commit 7ad1b612c8a2a1b1b47f6c3c580ced4bca17e1c7. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/v210enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c
index 17b3a9a6e2..77cb30bbfe 100644
--- a/libavcodec/v210enc.c
+++ b/libavcodec/v210enc.c
@@ -53,7 +53,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
int buf_size, void *data)
{
const AVFrame *pic = data;
- int aligned_width = FFALIGN(avctx->width, 48);
+ int aligned_width = ((avctx->width + 47) / 48) * 48;
int stride = aligned_width * 8 / 3;
int h, w;
const uint16_t *y = (const uint16_t*)pic->data[0];