summaryrefslogtreecommitdiff
path: root/libavcodec/huffyuvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-23 01:35:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-23 01:51:24 +0100
commite6d1c66d742d766a80a26ed2a9524a0fffbcf958 (patch)
treebf93e6d70c9af7126e1c9b53d4a20cbbb8e4e9c0 /libavcodec/huffyuvdec.c
parenteaacfc7dd1eaeec7e5e243f1e0ee5e8a7ff845a3 (diff)
avcodec/x86/lossless_videodsp: disable median optimizations for 16bps
They only support upto 15bps Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffyuvdec.c')
-rw-r--r--libavcodec/huffyuvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index e11012499c..c1e171a9a0 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -261,7 +261,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
{
HYuvContext *s = avctx->priv_data;
- ff_huffyuv_common_init(avctx);
memset(s->vlc, 0, 4 * sizeof(VLC));
s->interlaced = s->height > 288;
@@ -470,6 +469,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
}
+ ff_huffyuv_common_init(avctx);
if ((avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV420P) && avctx->width & 1) {
av_log(avctx, AV_LOG_ERROR, "width must be even for this colorspace\n");