summaryrefslogtreecommitdiffstats
path: root/libavcodec/vp6.c
diff options
context:
space:
mode:
authorBen Jackson <ben@ben.com>2012-09-06 14:30:39 -0700
committerMichael Niedermayer <michaelni@gmx.at>2012-09-07 01:36:21 +0200
commitde9f5b6853a7c860391df7636dc2bce90afd9a7d (patch)
tree9ae9d84c2a88a48ba8c561923b8c7b4e0ba20985 /libavcodec/vp6.c
parentc5278cb84f92e4be14a1372b35f25485a296d10d (diff)
downloadffmpeg-streaming-de9f5b6853a7c860391df7636dc2bce90afd9a7d.zip
ffmpeg-streaming-de9f5b6853a7c860391df7636dc2bce90afd9a7d.tar.gz
lavc/vp6: Disable deblock filtering for Simple Profile
In vp6 Advanced Profile, deblock filtering is conditionally enabled in each frame header. In Simple Profile it should always be off. vp6 was inheriting the wrong default from ff_vp56_init. Signed-off-by: Ben Jackson <ben@ben.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp6.c')
-rw-r--r--libavcodec/vp6.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 34361e8..2002a1e 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -596,6 +596,7 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx)
ff_vp56_init(avctx, avctx->codec->id == AV_CODEC_ID_VP6,
avctx->codec->id == AV_CODEC_ID_VP6A);
+ s->deblock_filtering = 0;
s->vp56_coord_div = vp6_coord_div;
s->parse_vector_adjustment = vp6_parse_vector_adjustment;
s->filter = vp6_filter;
OpenPOWER on IntegriCloud