[FFmpeg-devel,4/5] avformat/vividas: Remove align offset which is always masked off

Submitted by Michael Niedermayer on Aug. 31, 2019, 10:32 p.m.

Details

Message ID 20190831223240.27804-4-michael@niedermayer.cc
State Accepted
Commit 8e8fd25272c5c270243674184662ff6957e70484
Headers show

Commit Message

Michael Niedermayer Aug. 31, 2019, 10:32 p.m.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/vividas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Sept. 15, 2019, 10:26 p.m.
On Sun, Sep 01, 2019 at 12:32:39AM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/vividas.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

[...]

Patch hide | download patch | download mbox

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index 61dfcf11c1..075a521cd2 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -214,7 +214,7 @@  static uint8_t *read_vblock(AVIOContext *src, uint32_t *size,
     memcpy(buf, tmp, 4);
 
     if (avio_read(src, buf + 4, n) == n) {
-        decode_block(buf + 4, buf + 4, n, key, k2, align + 4);
+        decode_block(buf + 4, buf + 4, n, key, k2, align);
     } else {
         av_free(buf);
         buf = NULL;