diff mbox

[FFmpeg-devel] avformat/matroskadec: Fix default value of BlockAddID

Message ID 20191120122659.31154-1-andreas.rheinhardt@gmail.com
State Accepted
Commit dbc50f8a935043243232b2e01f3c012ab6d49928
Headers show

Commit Message

Andreas Rheinhardt Nov. 20, 2019, 12:26 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/matroskadec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Almer Nov. 20, 2019, 2:25 p.m. UTC | #1 
On 11/20/2019 9:26 AM, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavformat/matroskadec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index 0d15c634ee..fb3f0a1917 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -707,7 +707,7 @@ static EbmlSyntax matroska_segments[] = {
>  };
>  
>  static EbmlSyntax matroska_blockmore[] = {
> -    { MATROSKA_ID_BLOCKADDID,      EBML_UINT, 0, offsetof(MatroskaBlock,additional_id) },
> +    { MATROSKA_ID_BLOCKADDID,      EBML_UINT, 0, offsetof(MatroskaBlock,additional_id), { .u = 1 } },
>      { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN,  0, offsetof(MatroskaBlock,additional) },
>      CHILD_OF(matroska_blockadditions)
>  };

Applied, thanks.
diff mbox

Patch

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 0d15c634ee..fb3f0a1917 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -707,7 +707,7 @@  static EbmlSyntax matroska_segments[] = {
 };
 
 static EbmlSyntax matroska_blockmore[] = {
-    { MATROSKA_ID_BLOCKADDID,      EBML_UINT, 0, offsetof(MatroskaBlock,additional_id) },
+    { MATROSKA_ID_BLOCKADDID,      EBML_UINT, 0, offsetof(MatroskaBlock,additional_id), { .u = 1 } },
     { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN,  0, offsetof(MatroskaBlock,additional) },
     CHILD_OF(matroska_blockadditions)
 };