X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsp5xdec.c;h=8715c8db9de113d56af1c82c30b9f5a222b813cb;hb=0114c571d4c8cc1036850ced924683709390681a;hp=04ddf09fff529c86acd0ce081c2db47b40366ecd;hpb=e847f4128543432a77fb8f85c313646a406c76f6;p=ffmpeg

diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index 04ddf09fff5..8715c8db9de 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -68,7 +68,7 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
     memcpy(recoded+j, &sp5x_data_sos[0], sizeof(sp5x_data_sos));
     j += sizeof(sp5x_data_sos);
 
-    if(avctx->codec_id==CODEC_ID_AMV)
+    if(avctx->codec_id==AV_CODEC_ID_AMV)
         for (i = 2; i < buf_size-2 && j < buf_size+1024-2; i++)
             recoded[j++] = buf[i];
     else
@@ -90,14 +90,14 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
 
     av_free(recoded);
 
-    return i;
+    return i < 0 ? i : avpkt->size;
 }
 
 #if CONFIG_SP5X_DECODER
 AVCodec ff_sp5x_decoder = {
     .name           = "sp5x",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_SP5X,
+    .id             = AV_CODEC_ID_SP5X,
     .priv_data_size = sizeof(MJpegDecodeContext),
     .init           = ff_mjpeg_decode_init,
     .close          = ff_mjpeg_decode_end,
@@ -111,7 +111,7 @@ AVCodec ff_sp5x_decoder = {
 AVCodec ff_amv_decoder = {
     .name           = "amv",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_AMV,
+    .id             = AV_CODEC_ID_AMV,
     .priv_data_size = sizeof(MJpegDecodeContext),
     .init           = ff_mjpeg_decode_init,
     .close          = ff_mjpeg_decode_end,