X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fxfacedec.c;h=27295ff5185deeedbeb304232c90f186a678a636;hb=e5af9203098a889f36b759652615046254d45102;hp=d045cb6ef4ef13dadebfc17ea8e601d6792ca8d0;hpb=1325ac4c93f27dd56ebce37d8045d7ceb64dc645;p=ffmpeg

diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c
index d045cb6ef4e..27295ff5185 100644
--- a/libavcodec/xfacedec.c
+++ b/libavcodec/xfacedec.c
@@ -123,7 +123,7 @@ static int xface_decode_frame(AVCodecContext *avctx,
     if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
         return ret;
 
-    for (i = 0, k = 0; avpkt->data[i] && i < avpkt->size; i++) {
+    for (i = 0, k = 0; i < avpkt->size && avpkt->data[i]; i++) {
         c = avpkt->data[i];
 
         /* ignore invalid digits */
@@ -176,7 +176,7 @@ static int xface_decode_frame(AVCodecContext *avctx,
     return avpkt->size;
 }
 
-AVCodec ff_xface_decoder = {
+const AVCodec ff_xface_decoder = {
     .name           = "xface",
     .long_name      = NULL_IF_CONFIG_SMALL("X-face image"),
     .type           = AVMEDIA_TYPE_VIDEO,
@@ -185,4 +185,5 @@ AVCodec ff_xface_decoder = {
     .init           = xface_decode_init,
     .decode         = xface_decode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE },
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };