Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'

* commit '06cf597c352519d2b70f293518c61b8c312f5d4f':
  yop: check that extradata is large enough.

Conflicts:
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/yop.c

@@ -89,8 +89,8 @@ static av_cold int yop_decode_init(AVCodecContext *avctx)
         return AVERROR_INVALIDDATA;
     }
 
-    if (!avctx->extradata) {
-        av_log(avctx, AV_LOG_ERROR, "extradata missing\n");
+    if (avctx->extradata_size < 3) {
+        av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata.\n");
         return AVERROR_INVALIDDATA;
     }