avcodec/packet_internal: move the next pointer in PacketList to the top of the struct

[ffmpeg] / libavformat / apm.c

diff --git a/libavformat/apm.c b/libavformat/apm.c
index 4c5844c83e92c91aa9018995a3b399bf83d704b0..6ae53b87125de664be2ec604c6bb6c567bafaf90 100644 (file)
--- a/libavformat/apm.c
+++ b/libavformat/apm.c
@@ -26,7 +26,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 
-#define APM_FILE_HEADER_SIZE    18
+#define APM_FILE_HEADER_SIZE    20
 #define APM_FILE_EXTRADATA_SIZE 80
 #define APM_EXTRADATA_SIZE      28
 
@@ -201,7 +201,7 @@ static int apm_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVInputFormat ff_apm_demuxer = {
+const AVInputFormat ff_apm_demuxer = {
     .name           = "apm",
     .long_name      = NULL_IF_CONFIG_SMALL("Ubisoft Rayman 2 APM"),
     .read_probe     = apm_probe,
@@ -287,7 +287,7 @@ static int apm_write_trailer(AVFormatContext *s)
     int64_t file_size, data_size;
 
     file_size = avio_tell(s->pb);
-    data_size = file_size - (APM_FILE_HEADER_SIZE + 2 + APM_FILE_EXTRADATA_SIZE);
+    data_size = file_size - (APM_FILE_HEADER_SIZE + APM_FILE_EXTRADATA_SIZE);
 
     if (file_size >= UINT32_MAX) {
         av_log(s, AV_LOG_ERROR,
@@ -303,7 +303,7 @@ static int apm_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat ff_apm_muxer = {
+const AVOutputFormat ff_apm_muxer = {
     .name           = "apm",
     .long_name      = NULL_IF_CONFIG_SMALL("Ubisoft Rayman 2 APM"),
     .extensions     = "apm",