Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:04:02 +0000 (08:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:04:02 +0000 (08:04 +0200)
* commit '564b7e0c0095768cd20001b28154d69462be54e7':
  matroskadec: silently skip CodecState element.
  smacker: fix off-by-one error in palette expanding code

Conflicts:
libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/matroska.h
libavformat/matroskadec.c
libavformat/smacker.c

Simple merge
@@@ -547,23 -495,12 +547,24 @@@ static EbmlSyntax matroska_segments[] 
      { 0 }
  };
  
 +static EbmlSyntax matroska_blockmore[] = {
 +    { MATROSKA_ID_BLOCKADDID,      EBML_UINT, 0, offsetof(MatroskaBlock,additional_id) },
 +    { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN,  0, offsetof(MatroskaBlock,additional) },
 +    { 0 }
 +};
 +
 +static EbmlSyntax matroska_blockadditions[] = {
 +    { MATROSKA_ID_BLOCKMORE, EBML_NEST, 0, 0, {.n=matroska_blockmore} },
 +    { 0 }
 +};
 +
  static EbmlSyntax matroska_blockgroup[] = {
      { MATROSKA_ID_BLOCK,          EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
 +    { MATROSKA_ID_BLOCKADDITIONS, EBML_NEST, 0, 0, {.n=matroska_blockadditions} },
      { MATROSKA_ID_SIMPLEBLOCK,    EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
 -    { MATROSKA_ID_BLOCKDURATION,  EBML_UINT, 0, offsetof(MatroskaBlock,duration), {.u=AV_NOPTS_VALUE} },
 +    { MATROSKA_ID_BLOCKDURATION,  EBML_UINT, 0, offsetof(MatroskaBlock,duration) },
      { MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock,reference) },
+     { MATROSKA_ID_CODECSTATE,     EBML_NONE },
      { 1,                          EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} },
      { 0 }
  };
Simple merge