avformat/avio: Add Metacube support

[ffmpeg] / libavcodec / psd.c

diff --git a/libavcodec/psd.c b/libavcodec/psd.c
index a31f73857a521925ce9a619171fe0ec1c0a0519b..681d8a83c95281592d1bcb53be69352b577e9d39 100644 (file)
--- a/libavcodec/psd.c
+++ b/libavcodec/psd.c
@@ -211,11 +211,9 @@ static int decode_header(PSDContext * s)
     case 2:
         avpriv_request_sample(s->avctx, "ZIP without predictor compression");
         return AVERROR_PATCHWELCOME;
-        break;
     case 3:
         avpriv_request_sample(s->avctx, "ZIP with predictor compression");
         return AVERROR_PATCHWELCOME;
-        break;
     default:
         av_log(s->avctx, AV_LOG_ERROR, "Unknown compression %d.\n", s->compression);
         return AVERROR_INVALIDDATA;
@@ -547,7 +545,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     return avpkt->size;
 }
 
-AVCodec ff_psd_decoder = {
+const AVCodec ff_psd_decoder = {
     .name             = "psd",
     .long_name        = NULL_IF_CONFIG_SMALL("Photoshop PSD file"),
     .type             = AVMEDIA_TYPE_VIDEO,