avutil/mem: Also poison new av_realloc-allocated blocks

[ffmpeg] / libavformat / sga.c

diff --git a/libavformat/sga.c b/libavformat/sga.c
index 957ca0f4cdade60ef84a8844f802b68810a8f934..3dc62317a161ac86b67d81a578978e1a8e7b5060 100644 (file)
--- a/libavformat/sga.c
+++ b/libavformat/sga.c
@@ -75,9 +75,11 @@ static int sga_probe(const AVProbeData *p)
         if (last_left < 0)
             return 0;
         if (sectors && header && last_left == 0) {
-            if (left <= 8)
-                return 0;
-            last_left = left;
+            if (header >> 12) {
+                last_left = left;
+            } else {
+                last_left = left = header;
+            }
         } else if (sectors && header) {
             left = header;
             last_left -= left;
@@ -230,11 +232,11 @@ static void print_stats(AVFormatContext *s, const char *where)
     SGADemuxContext *sga = s->priv_data;
 
     av_log(s, AV_LOG_DEBUG, "START %s\n", where);
-    av_log(s, AV_LOG_DEBUG, "pos: %lX\n", avio_tell(s->pb));
+    av_log(s, AV_LOG_DEBUG, "pos: %"PRIX64"\n", avio_tell(s->pb));
     av_log(s, AV_LOG_DEBUG, "idx: %X\n", sga->idx);
     av_log(s, AV_LOG_DEBUG, "packet_type: %X\n", sga->packet_type);
     av_log(s, AV_LOG_DEBUG, "payload_size: %X\n", sga->payload_size);
-    av_log(s, AV_LOG_DEBUG, "SECTOR: %016lX\n", AV_RB64(sga->sector));
+    av_log(s, AV_LOG_DEBUG, "SECTOR: %016"PRIX64"\n", AV_RB64(sga->sector));
     av_log(s, AV_LOG_DEBUG, "stream: %X\n", sga->sector[1]);
     av_log(s, AV_LOG_DEBUG, "END %s\n", where);
 }
@@ -298,7 +300,7 @@ static int sga_video_packet(AVFormatContext *s, AVPacket *pkt)
     sga->flags = 0;
     update_type_size(s);
 
-    av_log(s, AV_LOG_DEBUG, "VIDEO PACKET: %d:%016lX i:%X\n", pkt->size, AV_RB64(sga->sector), sga->idx);
+    av_log(s, AV_LOG_DEBUG, "VIDEO PACKET: %d:%016"PRIX64" i:%X\n", pkt->size, AV_RB64(sga->sector), sga->idx);
 
     return 0;
 }
@@ -345,7 +347,7 @@ static int sga_audio_packet(AVFormatContext *s, AVPacket *pkt)
     sga->flags = 0;
     update_type_size(s);
 
-    av_log(s, AV_LOG_DEBUG, "AUDIO PACKET: %d:%016lX i:%X\n", pkt->size, AV_RB64(sga->sector), sga->idx);
+    av_log(s, AV_LOG_DEBUG, "AUDIO PACKET: %d:%016"PRIX64" i:%X\n", pkt->size, AV_RB64(sga->sector), sga->idx);
 
     return 0;
 }
@@ -464,7 +466,7 @@ static int sga_seek(AVFormatContext *s, int stream_index,
     return -1;
 }
 
-AVInputFormat ff_sga_demuxer = {
+const AVInputFormat ff_sga_demuxer = {
     .name           = "sga",
     .long_name      = NULL_IF_CONFIG_SMALL("Digital Pictures SGA"),
     .priv_data_size = sizeof(SGADemuxContext),