From: Luca Barbato <lu_zero@gentoo.org>
Date: Tue, 22 Oct 2013 17:17:10 +0000 (+0200)
Subject: mpegvideo: Drop a faulty assert
X-Git-Tag: v10_alpha1~494
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72072bf9de3241848ea86f68d2297b7a5d6ad49b;p=platform%2Fupstream%2Flibav.git

mpegvideo: Drop a faulty assert

That check is easily reachable by faulty input.

CC:libav-stable@libav.org
Reported-by: Torsten Sadowski <tsadowski@gmx.net>
---

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 192e27f..718f946 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1633,8 +1633,12 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
             return ret;
     }
 
-    assert(s->pict_type == AV_PICTURE_TYPE_I || (s->last_picture_ptr &&
-                                                 s->last_picture_ptr->f.data[0]));
+    if (s->pict_type != AV_PICTURE_TYPE_I &&
+        !(s->last_picture_ptr && s->last_picture_ptr->f.data[0])) {
+        av_log(s, AV_LOG_ERROR,
+               "Non-reference picture received and no reference available\n");
+        return AVERROR_INVALIDDATA;
+    }
 
     if (s->picture_structure!= PICT_FRAME) {
         int i;