[FFmpeg-cvslog] avformat/apm: fix APM_FILE_HEADER_SIZE value

Zane van Iperen git at videolan.org
Thu Jul 30 04:52:05 EEST 2020


ffmpeg | branch: master | Zane van Iperen <zane at zanevaniperen.com> | Wed Jul 29 22:06:50 2020 +1000| [be3c10d5517824318254a99007c7b1c07559c264] | committer: Zane van Iperen

avformat/apm: fix APM_FILE_HEADER_SIZE value

Value was incorrectly changed in 3bf1be210150b435c51c7c8eb8fd05a1fca08814.

Signed-off-by: Zane van Iperen <zane at zanevaniperen.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be3c10d5517824318254a99007c7b1c07559c264
---

 libavformat/apm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/apm.c b/libavformat/apm.c
index 4c5844c83e..38a0f6382a 100644
--- 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
 
@@ -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,



More information about the ffmpeg-cvslog mailing list