avcodec/mediacodec_wrapper: use MediaFormat to probe frame color characteristics

[ffmpeg] / libavcodec / fmvc.c

diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c
index a06b90c6fe24f8e8f83d0d8d36d1905cdfcb0481..5bee96a18de4d4f4385a7161960f7dcc925d2a4c 100644 (file)
--- a/libavcodec/fmvc.c
+++ b/libavcodec/fmvc.c
@@ -402,6 +402,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     AVFrame *frame = data;
     int ret, y, x;
 
+    if (avpkt->size < 8)
+        return AVERROR_INVALIDDATA;
+
     if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
         return ret;
 
@@ -530,7 +533,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
     switch (avctx->bits_per_coded_sample) {
     case 16:
-        avctx->pix_fmt = AV_PIX_FMT_RGB555;
+        avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
         break;
     case 24:
         avctx->pix_fmt = AV_PIX_FMT_BGR24;