diff mbox series

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

Message ID 20200729121421.945299-1-zane@zanevaniperen.com
State Accepted
Commit be3c10d5517824318254a99007c7b1c07559c264
Headers show
Series [FFmpeg-devel] avformat/apm: fix APM_FILE_HEADER_SIZE value
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Zane van Iperen July 29, 2020, 12:14 p.m. UTC
Value was incorrectly changed in 3bf1be210150b435c51c7c8eb8fd05a1fca08814.

Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
---
 libavformat/apm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Zane van Iperen July 29, 2020, 12:17 p.m. UTC | #1
On Wed, 29 Jul 2020 12:14:40 +0000
"Zane van Iperen" <zane@zanevaniperen.com> wrote:

> 
> Value was incorrectly changed in
> 3bf1be210150b435c51c7c8eb8fd05a1fca08814.
> 

I'll apply this tomorrow if no objections.
Andreas Rheinhardt July 29, 2020, 1:09 p.m. UTC | #2
Zane van Iperen:
> On Wed, 29 Jul 2020 12:14:40 +0000
> "Zane van Iperen" <zane@zanevaniperen.com> wrote:
> 
>>
>> Value was incorrectly changed in
>> 3bf1be210150b435c51c7c8eb8fd05a1fca08814.
>>
> 
> I'll apply this tomorrow if no objections.
> 

The best place for such small comments is directly below the --- in the
email containing the patch. You can use the --annotate option to git
send-email for this.

- Andreas
Zane van Iperen July 29, 2020, 10:18 p.m. UTC | #3
On Wed, 29 Jul 2020 15:09:28 +0200
"Andreas Rheinhardt" <andreas.rheinhardt@gmail.com> wrote:

> 
> Zane van Iperen:
> > On Wed, 29 Jul 2020 12:14:40 +0000
> > "Zane van Iperen" <zane@zanevaniperen.com> wrote:
> >
> >>
> >> Value was incorrectly changed in
> >> 3bf1be210150b435c51c7c8eb8fd05a1fca08814.
> >>
> >
> > I'll apply this tomorrow if no objections.
> >
> 
> The best place for such small comments is directly below the --- in
> the email containing the patch. You can use the --annotate option to
> git send-email for this.
> 
Huh, I actually had no idea that existed. Thanks!
diff mbox series

Patch

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,