X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmxfdec.c;h=cf4931e7318d64e2e966d03d78235e4fe7d1ed73;hb=b43b95f4789b6e60f9684918fd3c0a5f3f18aef6;hp=ef82f0c6d1282dae0683d51c685bfb6e18036b3d;hpb=41ed7ab45fc693f7d7fc35664c0233f4c32d69bb;p=ffmpeg

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index ef82f0c6d12..cf4931e7318 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -981,7 +981,7 @@ static const MXFCodecUL mxf_data_essence_container_uls[] = {
     { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x09,0x0d,0x01,0x03,0x01,0x02,0x0e,0x00,0x00 }, 16, AV_CODEC_ID_NONE },
 };
 
-static const char* mxf_data_essence_descriptor[] = {
+static const char * const mxf_data_essence_descriptor[] = {
     "vbi_vanc_smpte_436M",
 };
 
@@ -1933,7 +1933,7 @@ static int mxf_parse_handle_essence(MXFContext *mxf)
         /* remember where we were so we don't end up seeking further back than this */
         mxf->last_forward_tell = avio_tell(pb);
 
-        if (!pb->seekable) {
+        if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) {
             av_log(mxf->fc, AV_LOG_INFO, "file is not seekable - not parsing last partition\n");
             return -1;
         }
@@ -2080,7 +2080,7 @@ static void mxf_read_random_index_pack(AVFormatContext *s)
     int64_t file_size;
     KLVPacket klv;
 
-    if (!s->pb->seekable)
+    if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL))
         return;
 
     file_size = avio_size(s->pb);
@@ -2479,8 +2479,8 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
     if ((ret64 = avio_seek(s->pb, pos, SEEK_SET)) < 0)
         return ret64;
 
-        if ((ret = av_get_packet(s->pb, pkt, size)) != size)
-            return ret < 0 ? ret : AVERROR_EOF;
+    if ((ret = av_get_packet(s->pb, pkt, size)) != size)
+        return ret < 0 ? ret : AVERROR_EOF;
 
     pkt->stream_index = 0;