Module: libav Branch: release/0.8 Commit: 7f80928c0e7a74dff58d6c9b0172e34619844d01
Author: Martin Storsjö <[email protected]> Committer: Luca Barbato <[email protected]> Date: Thu Sep 12 11:58:25 2013 +0300 cavsdec: Make sure a sequence header has been decoded before decoding pictures Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit e90a6846c2c006fbebd00e1f2789f4a86fafacef) Signed-off-by: Luca Barbato <[email protected]> Conflicts: libavcodec/cavsdec.c --- libavcodec/cavsdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 1dd237a..5582fd4 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -467,6 +467,11 @@ static int decode_pic(AVSContext *h) { int skip_count = -1; enum cavs_mb mb_type; + if (!h->top_qp) { + av_log(h, AV_LOG_ERROR, "No sequence header decoded yet\n"); + return AVERROR_INVALIDDATA; + } + if (!s->context_initialized) { s->avctx->idct_algo = FF_IDCT_CAVS; if (MPV_common_init(s) < 0) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
