1 files changed, 339 insertions, 170 deletions

diff --git a/src/plugins/old/ebml_extractor.c b/src/plugins/old/ebml_extractor.c
index 2d52d90..f7daa9a 100644
--- a/src/plugins/old/ebml_extractor.c
+++ b/src/plugins/old/ebml_extractor.c
@@ -18,11 +18,11 @@
      Boston, MA 02110-1301, USA.
  */
 
- /*
-  * Made by Gabriel Peixoto
-  * Using AVInfo 1.x code. Copyright (c) 2004 George Shuklin.
-  * Nearly complete rewrite by LRN, Copyright (c) 2012
-  */
+/*
+ * Made by Gabriel Peixoto
+ * Using AVInfo 1.x code. Copyright (c) 2004 George Shuklin.
+ * Nearly complete rewrite by LRN, Copyright (c) 2012
+ */
 
 #include "platform.h"
 #include "extractor.h"
@@ -44,20 +44,25 @@
 struct tm *
 gmtime_undocumented_64_r (const __time64_t *timer, struct tm *result)
 {
-   struct tm *local_result = NULL;//_gmtime64 (timer);
+  struct tm *local_result = NULL; // _gmtime64 (timer);
 
-   if (local_result == NULL || result == NULL)
-     return NULL;
+  if ((local_result == NULL) || (result == NULL) )
+    return NULL;
 
-   memcpy (result, local_result, sizeof (*result));
-   return result;
+  memcpy (result, local_result, sizeof (*result));
+  return result;
 }
+
+
 #endif
 
 #include "extractor_plugins.h"
 
-#define ADD_EBML(s,t) do { proc (proc_cls, "ebml", t, EXTRACTOR_METAFORMAT_UTF8, "text/plain", s, strlen(s)+1); } while (0)
-#define ADD_MATROSKA(s,t) do { proc (proc_cls, "matroska", t, EXTRACTOR_METAFORMAT_UTF8, "text/plain", s, strlen(s)+1); } while (0)
+#define ADD_EBML(s,t) do { proc (proc_cls, "ebml", t, EXTRACTOR_METAFORMAT_UTF8, \
+                                 "text/plain", s, strlen (s) + 1); } while (0)
+#define ADD_MATROSKA(s,t) do { proc (proc_cls, "matroska", t, \
+                                     EXTRACTOR_METAFORMAT_UTF8, "text/plain", s, \
+                                     strlen (s) + 1); } while (0)
 
 /**
  * String length limit. The spec does not limit the strings,
@@ -162,9 +167,9 @@ struct MatroskaTagMap tag_map[] = {
   {"KEYWORDS", EXTRACTOR_METATYPE_KEYWORDS},
   {"SUMMARY", EXTRACTOR_METATYPE_SUMMARY},
   /*
-    SYNOPSIS UTF-8 A description of the story line of the item. 
+    SYNOPSIS UTF-8 A description of the story line of the item.
     INITIAL_KEY UTF-8 The initial key that a musical track starts in. The format is identical to ID3.
-    PERIOD UTF-8 Describes the period that the piece is from or about. For example, "Renaissance". 
+    PERIOD UTF-8 Describes the period that the piece is from or about. For example, "Renaissance".
     LAW_RATING UTF-8 Depending on the country it's the format of the rating of a movie (P, R, X in the USA, an age in other countries or a URI defining a logo).
     ICRA binary The ICRA content rating for parental control. (Previously RSACi)
   */
@@ -176,7 +181,7 @@ struct MatroskaTagMap tag_map[] = {
   {"DATE_WRITTEN", EXTRACTOR_METATYPE_UNKNOWN_DATE},
   {"DATE_PURCHASED", EXTRACTOR_METATYPE_UNKNOWN_DATE},
   /*
-    RECORDING_LOCATION UTF-8 The location where the item was recorded. The countries corresponding to the string, same 2 octets as in Internet domains, or possibly ISO-3166. This code is followed by a comma, then more detailed information such as state/province, another comma, and then city. For example, "US, Texas, Austin". This will allow for easy sorting. It is okay to only store the country, or the country and the state/province. More detailed information can be added after the city through the use of additional commas. In cases where the province/state is unknown, but you want to store the city, simply leave a space between the two commas. For example, "US, , Austin". 
+    RECORDING_LOCATION UTF-8 The location where the item was recorded. The countries corresponding to the string, same 2 octets as in Internet domains, or possibly ISO-3166. This code is followed by a comma, then more detailed information such as state/province, another comma, and then city. For example, "US, Texas, Austin". This will allow for easy sorting. It is okay to only store the country, or the country and the state/province. More detailed information can be added after the city through the use of additional commas. In cases where the province/state is unknown, but you want to store the city, simply leave a space between the two commas. For example, "US, , Austin".
     COMPOSITION_LOCATION UTF-8 Location that the item was originaly designed/written. The countries corresponding to the string, same 2 octets as in Internet domains, or possibly ISO-3166. This code is followed by a comma, then more detailed information such as state/province, another comma, and then city. For example, "US, Texas, Austin". This will allow for easy sorting. It is okay to only store the country, or the country and the state/province. More detailed information can be added after the city through the use of additional commas. In cases where the province/state is unknown, but you want to store the city, simply leave a space between the two commas. For example, "US, , Austin".
     COMPOSER_NATIONALITY UTF-8 Nationality of the main composer of the item, mostly for classical music. The countries corresponding to the string, same 2 octets as in Internet domains, or possibly ISO-3166.
   */
@@ -188,7 +193,7 @@ struct MatroskaTagMap tag_map[] = {
     ENCODER UTF-8 The software or hardware used to encode this item. ("LAME" or "XviD")
     ENCODER_SETTINGS UTF-8 A list of the settings used for encoding this item. No specific format.
     BPS UTF-8 The average bits per second of the specified item. This is only the data in the Blocks, and excludes headers and any container overhead.
-    FPS UTF-8 The average frames per second of the specified item. This is typically the average number of Blocks per second. In the event that lacing is used, each laced chunk is to be counted as a seperate frame. 
+    FPS UTF-8 The average frames per second of the specified item. This is typically the average number of Blocks per second. In the event that lacing is used, each laced chunk is to be counted as a seperate frame.
   */
   {"BPM", EXTRACTOR_METATYPE_BEATS_PER_MINUTE},
   /*
@@ -201,7 +206,7 @@ struct MatroskaTagMap tag_map[] = {
   /*
     MCDI binary This is a binary dump of the TOC of the CDROM that this item was taken from. This holds the same information as the MCDI in ID3.
     ISBN UTF-8 International Standard Book Number
-    BARCODE UTF-8 EAN-13 (European Article Numbering) or UPC-A (Universal Product Code) bar code identifier 
+    BARCODE UTF-8 EAN-13 (European Article Numbering) or UPC-A (Universal Product Code) bar code identifier
     CATALOG_NUMBER UTF-8 A label-specific string used to identify the release (TIC 01 for example).
     LABEL_CODE UTF-8 A 4-digit or 5-digit number to identify the record label, typically printed as (LC) xxxx or (LC) 0xxxx on CDs medias or covers (only the number is stored).
     LCCN UTF-8 Library of Congress Control Number
@@ -281,7 +286,6 @@ enum
   MatroskaID_Tracks_Audio_BitDepth = 0x6264, /* not 0, UINT. Bits per sample, mostly used for PCM. */
 
 
-
   MatroskaID_Tags = 0x1254C367, /* can appear more than once. Element containing elements specific to Tracks/Chapters. A list of valid tags can be found here. */
   MatroskaID_Tags_Tag = 0x7373, /* mandatory, can appear more than once. Element containing elements specific to Tracks/Chapters. */
   MatroskaID_Tags_Tag_SimpleTag = 0x67C8, /* mandatory, can appear more than once, recursive. Contains general information about the target. */
@@ -315,12 +319,14 @@ enum VINTParseMode
  */
 static ssize_t
 VINTparse (struct EXTRACTOR_PluginList *plugin,
-           int64_t * result, enum VINTParseMode mode)
+           int64_t *result, enum VINTParseMode mode)
 {
   /* 10000000 01000000 00100000 00010000 00001000 00000100 00000010 00000001 */
-  static const unsigned char mask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
+  static const unsigned char mask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04,
+                                         0x02, 0x01 };
   /* 01111111 00111111 00011111 00001111 00000111 00000011 00000001 00000000 */
-  static const unsigned char imask[8] = { 0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00 };
+  static const unsigned char imask[8] = { 0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03,
+                                          0x01, 0x00 };
   static const int64_t int_negative_limits[8] = {
     -0x00000000000040LL, /*  7-bit integer */
     -0x00000000002000LL, /* 14-bit integer */
@@ -374,13 +380,11 @@ VINTparse (struct EXTRACTOR_PluginList *plugin,
    * 1-byte integer has 2^7 different values,
    * 2-byte integer has 2^14 different values,
    * etc
-   */
-  /*
+   *//*
    * Examine the first byte and see how many 0-bytes are at its beginning.
-   */
-  vint_width = 0;
+   */vint_width = 0;
   for (c = 0; c < 8; c++)
-    if (!(first_byte & mask[c]))
+    if (! (first_byte & mask[c]))
       vint_width++;
     else
       break;
@@ -403,7 +407,7 @@ VINTparse (struct EXTRACTOR_PluginList *plugin,
    * 0 1 2 3 4 5 6 7  8  9  10  11  12  13  14   15
    * 4-bit signed integer:
    * 0 1 2 3 4 5 6 7 -8 -7  -6  -5  -4  -3  -2   -1
-   * 
+   *
    * 3 here is 0011b, and -3 is 1101b
    * However, writing 1101b into int8_t memory location will NOT make
    * the machine interpret it as -3, it will be interpreted as 00001101b,
@@ -427,9 +431,7 @@ VINTparse (struct EXTRACTOR_PluginList *plugin,
    * which is outside of the signed integer range (remember, we're in 4-bit space here).
    * on the other hand, 5 and -3 both are within the range.
    * 4) if the number does not exceed the signed integer maximum (7), store it as-is
-   */
-
-  result_u = 0;
+   */result_u = 0;
   /* Copy the extra bytes into a temporary buffer, in the right order */
   for (c = 0; c < vint_width; c++)
     result_u += ((uint64_t) int_bytes[vint_width - c]) << (c * 8);
@@ -439,7 +441,8 @@ VINTparse (struct EXTRACTOR_PluginList *plugin,
   {
   case VINT_READ_UINT:
     /* Unset the 1-bit marker */
-    result_u += ((uint64_t) int_bytes[0] & imask[vint_width]) << (vint_width * 8);
+    result_u += ((uint64_t) int_bytes[0] & imask[vint_width]) << (vint_width
+                                                                  * 8);
     memcpy (result, &result_u, sizeof (uint64_t));
     break;
   case VINT_READ_ID:
@@ -449,7 +452,8 @@ VINTparse (struct EXTRACTOR_PluginList *plugin,
     break;
   case VINT_READ_SIZE:
     /* Unset the 1-bit marker */
-    result_u += ((uint64_t) int_bytes[0] & imask[vint_width]) << (vint_width * 8);
+    result_u += ((uint64_t) int_bytes[0] & imask[vint_width]) << (vint_width
+                                                                  * 8);
     /* Special case: all-1 size means "size is unknown". We indicate this
      * in the return value by setting it to UINT64_MAX.
      */
@@ -459,7 +463,8 @@ VINTparse (struct EXTRACTOR_PluginList *plugin,
     break;
   case VINT_READ_SINT:
     /* Unset the 1-bit marker */
-    result_u += ((uint64_t) int_bytes[0] & imask[vint_width]) << (vint_width * 8);
+    result_u += ((uint64_t) int_bytes[0] & imask[vint_width]) << (vint_width
+                                                                  * 8);
     /* Interpret large values as negative signed values */
     if (result_u > int_positive_limits[vint_width])
     {
@@ -492,7 +497,7 @@ VINTparse (struct EXTRACTOR_PluginList *plugin,
  */
 static ssize_t
 elementRead (struct EXTRACTOR_PluginList *plugin,
-             uint32_t *id, int64_t * size)
+             uint32_t *id, int64_t *size)
 {
   int64_t tempID;
   int64_t tempsize;
@@ -519,6 +524,7 @@ elementRead (struct EXTRACTOR_PluginList *plugin,
   return id_offset + size_offset;
 }
 
+
 static ssize_t
 idRead (struct EXTRACTOR_PluginList *plugin,
         uint64_t length, uint32_t *id)
@@ -537,8 +543,10 @@ idRead (struct EXTRACTOR_PluginList *plugin,
   return id_offset;
 }
 
+
 static ssize_t
-uintRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, uint64_t *result)
+uintRead (struct EXTRACTOR_PluginList *plugin, uint64_t length,
+          uint64_t *result)
 {
   size_t c;
   unsigned char *data;
@@ -552,6 +560,7 @@ uintRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, uint64_t *result
   return (ssize_t) length;
 }
 
+
 static ssize_t
 sintRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, int64_t *result)
 {
@@ -579,6 +588,7 @@ sintRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, int64_t *result)
   return (ssize_t) length;
 }
 
+
 static ssize_t
 stringRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, char *result)
 {
@@ -601,8 +611,10 @@ stringRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, char *result)
   return 1;
 }
 
+
 static ssize_t
-floatRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, long double *result)
+floatRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, long
+           double *result)
 {
   size_t c;
   unsigned char t[8];
@@ -612,7 +624,7 @@ floatRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, long double *re
     return -1;
 
   /* we don't support 10-byte floats, because not all C compilers will guarantee that long double is stored in 10 bytes in a IEEE-conformant format */
-  if (length != 4 && length != 8 /* && length != 10 */)
+  if ((length != 4) && (length != 8) /* && length != 10 */)
     return 0;
 
   for (c = 0; c < length; c++)
@@ -624,14 +636,15 @@ floatRead (struct EXTRACTOR_PluginList *plugin, uint64_t length, long double *re
 #endif
   }
   if (length == 4)
-    *result = * ((float *) t);
+    *result = *((float *) t);
   else if (length == 8)
-    *result = * ((double *) t);
+    *result = *((double *) t);
   else
-    *result = * ((long double *) t);
+    *result = *((long double *) t);
   return (ssize_t) length;
 }
 
+
 static const char stream_type_letters[] = "?vat";      /*[0]-no, [1]-video,[2]-audio,[3]-text */
 
 enum EBMLState
@@ -791,6 +804,7 @@ clean_ebml_state_ebml (struct ebml_state *state)
   state->doctype_read_version = 0;
 }
 
+
 static void
 clean_ebml_state_matroska_simpletags (struct ebml_state *state)
 {
@@ -809,7 +823,7 @@ clean_ebml_state_matroska_simpletags (struct ebml_state *state)
     if (el->string != NULL)
       free (el->string);
     free (el);
-    if (parent != NULL && parent->child == el)
+    if ((parent != NULL) && (parent->child == el))
       parent->child = next;
     el = next;
     if (next == NULL)
@@ -820,8 +834,10 @@ clean_ebml_state_matroska_simpletags (struct ebml_state *state)
   state->tag_current = NULL;
 }
 
+
 void
-matroska_add_tag (struct ebml_state *state, struct matroska_simpletag *parent, char *name, char *string)
+matroska_add_tag (struct ebml_state *state, struct matroska_simpletag *parent,
+                  char *name, char *string)
 {
   struct matroska_simpletag *el = malloc (sizeof (struct matroska_simpletag));
   el->parent = parent;
@@ -839,6 +855,7 @@ matroska_add_tag (struct ebml_state *state, struct matroska_simpletag *parent, c
   state->tag_last = el;
 }
 
+
 static void
 clean_ebml_state_matroska_seeks (struct ebml_state *state)
 {
@@ -852,6 +869,7 @@ clean_ebml_state_matroska_seeks (struct ebml_state *state)
   state->matroska_seeks_tail = NULL;
 }
 
+
 static void
 clean_ebml_state_matroska_segment (struct ebml_state *state)
 {
@@ -862,6 +880,7 @@ clean_ebml_state_matroska_segment (struct ebml_state *state)
   clean_ebml_state_matroska_simpletags (state);
 }
 
+
 static void
 clean_ebml_state_matroska_seek (struct ebml_state *state)
 {
@@ -869,6 +888,7 @@ clean_ebml_state_matroska_seek (struct ebml_state *state)
   state->matroska_seek_position = 0;
 }
 
+
 static void
 clean_ebml_state_matroska_info (struct ebml_state *state)
 {
@@ -889,6 +909,7 @@ clean_ebml_state_matroska_info (struct ebml_state *state)
   state->matroska_info_writing_app = NULL;
 }
 
+
 static void
 clean_ebml_state_matroska_track_video (struct ebml_state *state)
 {
@@ -902,6 +923,7 @@ clean_ebml_state_matroska_track_video (struct ebml_state *state)
   state->matroska_track_video_display_unit = 0;
 }
 
+
 static void
 clean_ebml_state_matroska_track_audio (struct ebml_state *state)
 {
@@ -912,6 +934,7 @@ clean_ebml_state_matroska_track_audio (struct ebml_state *state)
   state->matroska_track_audio_bit_depth = 0;
 }
 
+
 static void
 clean_ebml_state_matroska_track (struct ebml_state *state)
 {
@@ -935,6 +958,7 @@ clean_ebml_state_matroska_track (struct ebml_state *state)
   clean_ebml_state_matroska_track_audio (state);
 }
 
+
 static struct ebml_state *
 EXTRACTOR_ebml_init_state_method ()
 {
@@ -952,14 +976,17 @@ EXTRACTOR_ebml_init_state_method ()
   return state;
 }
 
+
 static void
-report_simpletag (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *proc_cls)
+report_simpletag (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc,
+                  void *proc_cls)
 {
   struct matroska_simpletag *el, *next;
   char format[MAX_STRING_SIZE + 1];
   for (el = state->tag_tree; el != NULL; el = next)
   {
-    if (el->name != NULL && el->name[0] != '\0' && el->string != NULL && el->string[0] != '\0')
+    if ((el->name != NULL) && (el->name[0] != '\0') && (el->string != NULL) &&
+        (el->string[0] != '\0') )
     {
       enum EXTRACTOR_MetaType metatype = EXTRACTOR_METATYPE_RESERVED;
       struct MatroskaTagMap *map_item;
@@ -975,10 +1002,10 @@ report_simpletag (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, vo
       {
         snprintf (format, MAX_STRING_SIZE, "%s=%s", el->name, el->string);
         format[MAX_STRING_SIZE] = '\0';
-        ADD_MATROSKA(format, EXTRACTOR_METATYPE_UNKNOWN);
+        ADD_MATROSKA (format, EXTRACTOR_METATYPE_UNKNOWN);
       }
       else
-        ADD_MATROSKA(el->string, metatype);
+        ADD_MATROSKA (el->string, metatype);
     }
     next = el->child;
     while (next == NULL && el != NULL)
@@ -991,18 +1018,21 @@ report_simpletag (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, vo
   clean_ebml_state_matroska_simpletags (state);
 }
 
+
 static void
-report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *proc_cls)
+report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc,
+              void *proc_cls)
 {
   char format[MAX_STRING_SIZE + 1];
   report_simpletag (state, proc, proc_cls);
-  if (state->valid_ebml && !state->reported_ebml)
+  if (state->valid_ebml && ! state->reported_ebml)
   {
     state->reported_ebml = 1;
-    snprintf (format, MAX_STRING_SIZE, "%llu", (unsigned long long) state->ebml_version);
+    snprintf (format, MAX_STRING_SIZE, "%llu", (unsigned long
+                                                long) state->ebml_version);
     format[MAX_STRING_SIZE] = '\0';
-    ADD_EBML(format, EXTRACTOR_METATYPE_FORMAT_VERSION);
-    snprintf (format, MAX_STRING_SIZE, "%s %llu (EBML %llu)", state->doctype, 
+    ADD_EBML (format, EXTRACTOR_METATYPE_FORMAT_VERSION);
+    snprintf (format, MAX_STRING_SIZE, "%s %llu (EBML %llu)", state->doctype,
               (unsigned long long) state->doctype_version,
               (unsigned long long) state->ebml_version);
     format[MAX_STRING_SIZE] = '\0';
@@ -1012,21 +1042,25 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
     clean_ebml_state_ebml (state);
   if (state->valid_matroska_info == -1)
   {
-    if ((state->matroska_info_duration > 0 || state->matroska_info_duration == -1.0) &&
-        state->matroska_info_muxing_app != NULL && state->matroska_info_writing_app != NULL)
+    if (((state->matroska_info_duration > 0) ||
+         (state->matroska_info_duration == -1.0) ) &&
+        (state->matroska_info_muxing_app != NULL) &&
+        (state->matroska_info_writing_app != NULL) )
       state->valid_matroska_info = 1;
     else
       state->valid_matroska_info = 0;
   }
-  if (state->valid_matroska_info == 1 && !state->reported_matroska_info)
+  if ((state->valid_matroska_info == 1) && ! state->reported_matroska_info)
   {
     state->reported_matroska_info = 1;
     if (state->matroska_info_duration != -1.0)
     {
-      uint64_t seconds = (uint64_t) ((state->matroska_info_duration * (float) state->matroska_info_timecode_scale) / 1e+9);
+      uint64_t seconds = (uint64_t) ((state->matroska_info_duration
+                                      * (float) state->
+                                      matroska_info_timecode_scale) / 1e+9);
       snprintf (format, MAX_STRING_SIZE, "%llus", (unsigned long long) seconds);
       format[MAX_STRING_SIZE] = '\0';
-      ADD_MATROSKA(format, EXTRACTOR_METATYPE_DURATION);
+      ADD_MATROSKA (format, EXTRACTOR_METATYPE_DURATION);
     }
     if (state->matroska_info_date_utc_is_set)
     {
@@ -1052,8 +1086,7 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
        * millenium is known and never changes), but we want to use 64-bit integer to
        * manipulate time. If it gets trimmed later, when assigning back to a TIME_TYPE
        * that happens to be 32-bit long - well, tough luck.
-       */
-      errno = 0;
+       */errno = 0;
 #if WINDOWS
       millenium_start_stamp = _mktime64 (&millenium_start);
 #else
@@ -1061,58 +1094,69 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
 #endif
       if (millenium_start_stamp == -1)
         printf ("Failed to convert time: %d\n", errno);
-      matroska_date_stamp = millenium_start_stamp * 1000000000 + state->matroska_info_date_utc;
+      matroska_date_stamp = millenium_start_stamp * 1000000000
+                            + state->matroska_info_date_utc;
       /* Now matroska_date_stamp is the number of nanoseconds since UNIX Epoch */
       matroska_date_stamp_time_t = matroska_date_stamp / 1000000000;
       /* Now matroska_date_stamp_time_t is the number of seconds since UNIX Epoch */
 #if WINDOWS
-      if (NULL != gmtime_undocumented_64_r (&matroska_date_stamp_time_t, &matroska_date))
+      if (NULL != gmtime_undocumented_64_r (&matroska_date_stamp_time_t,
+                                            &matroska_date))
 #else
       /* We want to be thread-safe. If you have no gmtime_r(), think of something! */
       if (NULL != gmtime_r (&matroska_date_stamp_time_t, &matroska_date))
 #endif
       {
-        if (0 != strftime (format, MAX_STRING_SIZE, "%Y.%m.%d %H:%M:%S UTC", &matroska_date))
-          ADD_MATROSKA(format, EXTRACTOR_METATYPE_CREATION_DATE);
+        if (0 != strftime (format, MAX_STRING_SIZE, "%Y.%m.%d %H:%M:%S UTC",
+                           &matroska_date))
+          ADD_MATROSKA (format, EXTRACTOR_METATYPE_CREATION_DATE);
       }
     }
     if (state->matroska_info_title != NULL)
-      ADD_MATROSKA(state->matroska_info_title, EXTRACTOR_METATYPE_TITLE);
-    if (strcmp (state->matroska_info_writing_app, state->matroska_info_muxing_app) == 0)
-      snprintf (format, MAX_STRING_SIZE, "Written and muxed with %s", state->matroska_info_writing_app);
+      ADD_MATROSKA (state->matroska_info_title, EXTRACTOR_METATYPE_TITLE);
+    if (strcmp (state->matroska_info_writing_app,
+                state->matroska_info_muxing_app) == 0)
+      snprintf (format, MAX_STRING_SIZE, "Written and muxed with %s",
+                state->matroska_info_writing_app);
     else
-      snprintf (format, MAX_STRING_SIZE, "Written with %s, muxed with %s", state->matroska_info_writing_app, state->matroska_info_muxing_app);
+      snprintf (format, MAX_STRING_SIZE, "Written with %s, muxed with %s",
+                state->matroska_info_writing_app,
+                state->matroska_info_muxing_app);
     format[MAX_STRING_SIZE] = '\0';
-    ADD_MATROSKA(format, EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE);
+    ADD_MATROSKA (format, EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE);
   }
   if (state->valid_matroska_info == 1)
     clean_ebml_state_matroska_info (state);
   if (state->valid_matroska_track == -1)
   {
-    if ((state->matroska_track_type > 0 && state->matroska_track_type < 255) &&
-        state->matroska_track_codec_id != NULL)
+    if (((state->matroska_track_type > 0) && (state->matroska_track_type <
+                                              255) ) &&
+        (state->matroska_track_codec_id != NULL) )
       state->valid_matroska_track = 1;
     else
       state->valid_matroska_track = 0;
   }
   if (state->valid_matroska_track_video == -1)
   {
-    if ((state->matroska_track_video_flag_interlaced == 0 || state->matroska_track_video_flag_interlaced == 1) &&
-        (state->matroska_track_video_stereo_mode >= 0 && state->matroska_track_video_stereo_mode <= 14) &&
-        state->matroska_track_video_pixel_width > 0 && state->matroska_track_video_pixel_height > 0)
+    if (((state->matroska_track_video_flag_interlaced == 0) ||
+         (state->matroska_track_video_flag_interlaced == 1) ) &&
+        ((state->matroska_track_video_stereo_mode >= 0) &&
+         (state->matroska_track_video_stereo_mode <= 14) ) &&
+        (state->matroska_track_video_pixel_width > 0) &&
+        (state->matroska_track_video_pixel_height > 0) )
       state->valid_matroska_track_video = 1;
     else
       state->valid_matroska_track_video = 0;
   }
   if (state->valid_matroska_track_audio == -1)
   {
-    if (state->matroska_track_audio_sampling_frequency > 0 &&
-        state->matroska_track_audio_channels > 0)
+    if ((state->matroska_track_audio_sampling_frequency > 0) &&
+        (state->matroska_track_audio_channels > 0) )
       state->valid_matroska_track_audio = 1;
     else
       state->valid_matroska_track_audio = 0;
   }
-  if (state->valid_matroska_track == 1 && !state->reported_matroska_track)
+  if ((state->valid_matroska_track == 1) && ! state->reported_matroska_track)
   {
     char name_part[MAX_STRING_SIZE + 1];
     char codec_part[MAX_STRING_SIZE + 1];
@@ -1142,28 +1186,32 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
     if (state->matroska_track_name == NULL)
       snprintf (name_part, MAX_STRING_SIZE, "%s", "");
     else
-      snprintf (name_part, MAX_STRING_SIZE, "`%s' ", state->matroska_track_name);
+      snprintf (name_part, MAX_STRING_SIZE, "`%s' ",
+                state->matroska_track_name);
     name_part[MAX_STRING_SIZE] = '\0';
 
     if (state->matroska_track_codec_name == NULL)
-      snprintf (codec_part, MAX_STRING_SIZE, "%s", state->matroska_track_codec_id);
+      snprintf (codec_part, MAX_STRING_SIZE, "%s",
+                state->matroska_track_codec_id);
     else
-      snprintf (codec_part, MAX_STRING_SIZE, "%s [%s]", state->matroska_track_codec_id, state->matroska_track_codec_name);
+      snprintf (codec_part, MAX_STRING_SIZE, "%s [%s]",
+                state->matroska_track_codec_id,
+                state->matroska_track_codec_name);
     codec_part[MAX_STRING_SIZE] = '\0';
 
-    if (use_video && state->valid_matroska_track_video == 1)
+    if (use_video && (state->valid_matroska_track_video == 1))
     {
       /* Ignore Display* for now. Aspect ratio correction could be
        * done either way (stretching horizontally or squishing vertically),
        * so let's stick to hard cold pixel counts.
        */
-      snprintf (format, MAX_STRING_SIZE, "%llux%llu", 
+      snprintf (format, MAX_STRING_SIZE, "%llux%llu",
                 (unsigned long long) state->matroska_track_video_pixel_width,
                 (unsigned long long) state->matroska_track_video_pixel_height);
       format[MAX_STRING_SIZE] = '\0';
       ADD_MATROSKA (format, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS);
     }
-    if (use_audio && state->valid_matroska_track_audio == 1)
+    if (use_audio && (state->valid_matroska_track_audio == 1))
     {
       double freq = state->matroska_track_audio_sampling_frequency;
       double rfreq = freq;
@@ -1176,20 +1224,24 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
       hz_part[MAX_STRING_SIZE] = '\0';
 
       if (state->matroska_track_audio_bit_depth > 0)
-        snprintf (bit_part, MAX_STRING_SIZE, "%llu-bit ", (unsigned long long) state->matroska_track_audio_bit_depth);
+        snprintf (bit_part, MAX_STRING_SIZE, "%llu-bit ", (unsigned long
+                                                           long) state->
+                  matroska_track_audio_bit_depth);
       else
         bit_part[0] = '\0';
       bit_part[MAX_STRING_SIZE] = '\0';
 
-      snprintf (format, MAX_STRING_SIZE, "%s track %s(%s, %llu-channel %sat %s) [%s]",
-          track_type_string, name_part, codec_part, 
-          (unsigned long long) state->matroska_track_audio_channels,
-          bit_part, hz_part, state->matroska_track_language);
+      snprintf (format, MAX_STRING_SIZE,
+                "%s track %s(%s, %llu-channel %sat %s) [%s]",
+                track_type_string, name_part, codec_part,
+                (unsigned long long) state->matroska_track_audio_channels,
+                bit_part, hz_part, state->matroska_track_language);
     }
     else
     {
       snprintf (format, MAX_STRING_SIZE, "%s track %s(%s) [%s]",
-          track_type_string, name_part, codec_part, state->matroska_track_language);
+                track_type_string, name_part, codec_part,
+                state->matroska_track_language);
     }
     format[MAX_STRING_SIZE] = '\0';
     ADD_EBML (format, EXTRACTOR_METATYPE_RESOURCE_TYPE);
@@ -1199,7 +1251,7 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
 }
 
 
-static int 
+static int
 EXTRACTOR_ebml_discard_state_method (struct ebml_state *state)
 {
   if (state != NULL)
@@ -1214,6 +1266,7 @@ EXTRACTOR_ebml_discard_state_method (struct ebml_state *state)
   return 1;
 }
 
+
 static struct ebml_element *
 ebml_stack_pop (struct ebml_state *state)
 {
@@ -1227,7 +1280,10 @@ ebml_stack_pop (struct ebml_state *state)
 
 
 static void
-ebml_stack_push_new (struct ebml_state *state, uint64_t position, uint32_t id, uint64_t size, uint64_t header_size, int finish_state, int prev_state, int bail_state, int bail_next_state)
+ebml_stack_push_new (struct ebml_state *state, uint64_t position, uint32_t id,
+                     uint64_t size, uint64_t header_size, int finish_state, int
+                     prev_state, int
+                     bail_state, int bail_next_state)
 {
   struct ebml_element *element = malloc (sizeof (struct ebml_element));
   element->parent = state->stack_top;
@@ -1242,8 +1298,10 @@ ebml_stack_push_new (struct ebml_state *state, uint64_t position, uint32_t id, u
   element->bail_next_state = bail_next_state;
 }
 
+
 static int
-check_result (struct EXTRACTOR_PluginList *plugin, ssize_t read_result, struct ebml_state *state)
+check_result (struct EXTRACTOR_PluginList *plugin, ssize_t read_result, struct
+              ebml_state *state)
 {
   if (read_result == 0)
   {
@@ -1256,7 +1314,7 @@ check_result (struct EXTRACTOR_PluginList *plugin, ssize_t read_result, struct e
       return 0;
     }
     offset = parent->position + parent->header_size + parent->size;
-    if (offset < 0 || offset != pl_seek (plugin, offset, SEEK_SET))
+    if ((offset < 0) || (offset != pl_seek (plugin, offset, SEEK_SET)))
     {
       state->state = EBML_BAD_STATE;
       return 0;
@@ -1269,12 +1327,16 @@ check_result (struct EXTRACTOR_PluginList *plugin, ssize_t read_result, struct e
   return 1;
 }
 
+
 static int
-maybe_rise_up (struct EXTRACTOR_PluginList *plugin, struct ebml_state *state, int *do_break, int64_t read_result)
+maybe_rise_up (struct EXTRACTOR_PluginList *plugin, struct ebml_state *state,
+               int *do_break, int64_t read_result)
 {
   int64_t offset;
   offset = pl_get_pos (plugin) - read_result;
-  if (state->stack_top != NULL && offset >= state->stack_top->position + state->stack_top->header_size + state->stack_top->size)
+  if ((state->stack_top != NULL) && (offset >= state->stack_top->position
+                                     + state->stack_top->header_size
+                                     + state->stack_top->size) )
   {
     state->state = state->stack_top->finish_state;
     pl_seek (plugin, -read_result, SEEK_CUR);
@@ -1284,24 +1346,29 @@ maybe_rise_up (struct EXTRACTOR_PluginList *plugin, struct ebml_state *state, in
   return 0;
 }
 
+
 static void
-rise_up_after_value (struct EXTRACTOR_PluginList *plugin, struct ebml_state *state, int next_state)
+rise_up_after_value (struct EXTRACTOR_PluginList *plugin, struct
+                     ebml_state *state, int next_state)
 {
   int64_t offset;
   state->state = EBML_READ_ELEMENT;
-  offset = state->stack_top->position + state->stack_top->header_size + state->stack_top->size;
+  offset = state->stack_top->position + state->stack_top->header_size
+           + state->stack_top->size;
   free (ebml_stack_pop (state));
   state->next_state = next_state;
   pl_seek (plugin, offset, SEEK_SET);
 }
 
+
 static void
 try_to_find_pos (struct EXTRACTOR_PluginList *plugin, struct ebml_state *state)
 {
   if (state->matroska_seeks != NULL)
   {
     struct matroska_seek_list *el, *pos = NULL;
-    int64_t segment_position = pl_get_pos (plugin) - state->segment_contents_start;
+    int64_t segment_position = pl_get_pos (plugin)
+                               - state->segment_contents_start;
     for (el = state->matroska_seeks; el != NULL; el = el->next)
     {
       if (el->position <= segment_position)
@@ -1314,8 +1381,10 @@ try_to_find_pos (struct EXTRACTOR_PluginList *plugin, struct ebml_state *state)
   }
 }
 
+
 static void
-maybe_seek_to_something_interesting (struct EXTRACTOR_PluginList *plugin, struct ebml_state *state)
+maybe_seek_to_something_interesting (struct EXTRACTOR_PluginList *plugin, struct
+                                     ebml_state *state)
 {
   int64_t offset;
   struct matroska_seek_list *el;
@@ -1350,12 +1419,14 @@ maybe_seek_to_something_interesting (struct EXTRACTOR_PluginList *plugin, struct
      * the one we've got from seek table. If it doesn't match - stop parsing the file.
      */
 #if DEBUG_EBML
-    printf ("Seeking from %llu to %llu\n", offset, el->position + state->segment_contents_start);
+    printf ("Seeking from %llu to %llu\n", offset, el->position
+            + state->segment_contents_start);
 #endif
     pl_seek (plugin, el->position + state->segment_contents_start, SEEK_SET);
   }
 }
 
+
 static void
 sort_seeks (struct ebml_state *state)
 {
@@ -1363,7 +1434,7 @@ sort_seeks (struct ebml_state *state)
   int64_t position;
   struct matroska_seek_list *el;
   char sorted = 0;
-  while (!sorted)
+  while (! sorted)
   {
     sorted = 1;
     for (el = state->matroska_seeks; el != NULL; el = el->next)
@@ -1386,7 +1457,8 @@ sort_seeks (struct ebml_state *state)
 
 
 int
-EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_MetaDataProcessor proc, void *proc_cls)
+EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin,
+                               EXTRACTOR_MetaDataProcessor proc, void *proc_cls)
 {
   uint64_t offset = 0;
   ssize_t read_result;
@@ -1406,7 +1478,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
 
   if (plugin == NULL)
     return 1;
-  
+
   state = EXTRACTOR_ebml_init_state_method ();
   if (state == NULL)
     return 1;
@@ -1421,7 +1493,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       return EXTRACTOR_ebml_discard_state_method (state);
     case EBML_LOOKING_FOR_HEADER:
       offset = pl_get_pos (plugin);
-      sint_value = pl_read (plugin, &data, 1024*1024);
+      sint_value = pl_read (plugin, &data, 1024 * 1024);
       if (sint_value < 4)
         return EXTRACTOR_ebml_discard_state_method (state);
       start = NULL;
@@ -1433,12 +1505,13 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
           offset = pl_get_pos (plugin) - 3;
           if (offset != pl_seek (plugin, offset, SEEK_SET))
             return EXTRACTOR_ebml_discard_state_method (state);
-          sint_value = pl_read (plugin, &data, 1024*1024);
+          sint_value = pl_read (plugin, &data, 1024 * 1024);
           if (sint_value < 4)
             return EXTRACTOR_ebml_discard_state_method (state);
         }
       }
-      if (offset + start - data != pl_seek (plugin, offset + start - data, SEEK_SET))
+      if (offset + start - data != pl_seek (plugin, offset + start - data,
+                                            SEEK_SET))
         return EXTRACTOR_ebml_discard_state_method (state);
       state->state = EBML_READING_HEADER;
       break;
@@ -1458,7 +1531,9 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       state->state = EBML_READ_ELEMENT;
       state->next_state = EBML_READING_HEADER_ELEMENTS;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_HEADER, EBML_BAD_STATE, EBML_FINISHED_READING_HEADER, EBML_BAD_STATE);
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_FINISHED_READING_HEADER, EBML_BAD_STATE,
+                           EBML_FINISHED_READING_HEADER, EBML_BAD_STATE);
       break;
     case EBML_READ_ELEMENT:
 #if DEBUG_EBML
@@ -1475,19 +1550,14 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       state->state = state->next_state;
       break;
-      */
-      /* while the following code crashes with SIGILL.
-       */
-      /*
+      *//* while the following code crashes with SIGILL.
+       *//*
       read_result = elementRead (plugin, &eID, &eSize);
       state->state = state->next_state;
       if (read_result < 0)
         state->state = EBML_BAD_STATE;
       break;
-      */
-      /* but the following code works as intended */
-      /* All three code snippets were compiled with -O0 */
-      {
+      *//* but the following code works as intended *//* All three code snippets were compiled with -O0 */{
         enum EBMLState next_state = state->next_state;
         state->state = EBML_BAD_STATE;
         read_result = elementRead (plugin, &eID, (int64_t*) &eSize);
@@ -1506,7 +1576,8 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         read_result = 0;
       else
       {
-        if (0 > (read_result = uintRead (plugin, state->stack_top->size, &uint_value)))
+        if (0 > (read_result = uintRead (plugin, state->stack_top->size,
+                                         &uint_value)))
         {
           state->state = EBML_BAD_STATE;
           break;
@@ -1516,7 +1587,8 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       state->state = state->next_state;
       break;
     case EBML_READ_ID:
-      if (0 > (read_result = idRead (plugin, state->stack_top->size, &id_value)))
+      if (0 > (read_result = idRead (plugin, state->stack_top->size,
+                                     &id_value)))
       {
         state->state = EBML_BAD_STATE;
         break;
@@ -1534,7 +1606,8 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         read_result = 0;
       else
       {
-        if (0 > (read_result = sintRead (plugin, state->stack_top->size, &sint_value)))
+        if (0 > (read_result = sintRead (plugin, state->stack_top->size,
+                                         &sint_value)))
         {
           state->state = EBML_BAD_STATE;
           break;
@@ -1554,7 +1627,8 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         read_result = 0;
       else
       {
-        if (0 > (read_result = floatRead (plugin, state->stack_top->size, &float_value)))
+        if (0 > (read_result = floatRead (plugin, state->stack_top->size,
+                                          &float_value)))
         {
           state->state = EBML_BAD_STATE;
           break;
@@ -1571,7 +1645,8 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       else
       {
-        if (0 > (read_result = stringRead (plugin, state->stack_top->size, (char *) &string_value)))
+        if (0 > (read_result = stringRead (plugin, state->stack_top->size,
+                                           (char *) &string_value)))
         {
           state->state = EBML_BAD_STATE;
           break;
@@ -1581,7 +1656,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       state->state = state->next_state;
       break;
     case EBML_READING_HEADER_ELEMENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
       do_break = 0;
       switch (eID)
@@ -1609,10 +1684,13 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       if (do_break)
         break;
       state->next_state = EBML_READING_HEADER_ELEMENT_VALUE;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_BAD_STATE, EBML_READING_HEADER_ELEMENTS, EBML_READ_ELEMENT, EBML_READING_HEADER_ELEMENTS);
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_BAD_STATE, EBML_READING_HEADER_ELEMENTS,
+                           EBML_READ_ELEMENT,
+                           EBML_READING_HEADER_ELEMENTS);
       break;
     case EBML_READING_HEADER_ELEMENT_VALUE:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       switch (state->stack_top->id)
@@ -1632,8 +1710,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
            * We also stop right here and do not assume that somewhere further
            * in the file there's another EBML header that is, maybe, readable
            * by us. If you think this is worth correcting - patches are welcome.
-           */
-          continue;
+           */continue;
         }
         break;
       case EBMLID_MAX_ID_LENGTH:
@@ -1658,7 +1735,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       rise_up_after_value (plugin, state, EBML_READING_HEADER_ELEMENTS);
       break;
     case EBML_FINISHED_READING_HEADER:
-      if (!state->valid_ebml)
+      if (! state->valid_ebml)
       {
         /* Header was invalid (lacking doctype). */
         state->next_state = EBML_SKIP_UNTIL_NEXT_HEADER;
@@ -1680,8 +1757,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
            * metadata from it!), we do not care about these differences
            * (which means that this code will happily read webm files that do
            * not conform to Webm spec, but conform to Matroska spec).
-           */
-          state->next_state = EBML_READING_MATROSKA_SEGMENT;
+           */state->next_state = EBML_READING_MATROSKA_SEGMENT;
         }
         else
         {
@@ -1727,11 +1803,14 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       state->state = EBML_READ_ELEMENT;
       state->next_state = EBML_READING_MATROSKA_SEGMENT_CONTENTS;
       clean_ebml_state_matroska_segment (state);
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_SEGMENT_CONTENTS, EBML_READING_MATROSKA_SEGMENT, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SEGMENT);
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_FINISHED_READING_MATROSKA_SEGMENT_CONTENTS,
+                           EBML_READING_MATROSKA_SEGMENT, EBML_READ_ELEMENT,
+                           EBML_READING_MATROSKA_SEGMENT);
       state->segment_contents_start = pl_get_pos (plugin);
       break;
     case EBML_READING_MATROSKA_SEGMENT_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       state->state = EBML_READ_ELEMENT;
@@ -1739,20 +1818,40 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       {
       case MatroskaID_SeekHead:
         state->next_state = EBML_READING_MATROSKA_SEEK_HEAD_CONTENTS;
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_SEEK_HEAD_CONTENTS, EBML_READING_MATROSKA_SEGMENT_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SEGMENT_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_SEEK_HEAD_CONTENTS,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS);
         break;
       case MatroskaID_Info:
         state->next_state = EBML_READING_MATROSKA_INFO_CONTENTS;
         clean_ebml_state_matroska_info (state);
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_INFO_CONTENTS, EBML_READING_MATROSKA_SEGMENT_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SEGMENT_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_INFO_CONTENTS,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS);
         break;
       case MatroskaID_Tracks:
         state->next_state = EBML_READING_MATROSKA_TRACKS_CONTENTS;
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_TRACKS_CONTENTS, EBML_READING_MATROSKA_SEGMENT_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SEGMENT_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_TRACKS_CONTENTS,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS);
         break;
       case MatroskaID_Tags:
         state->next_state = EBML_READING_MATROSKA_TAGS_CONTENTS;
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_TAGS_CONTENTS, EBML_READING_MATROSKA_SEGMENT_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SEGMENT_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_TAGS_CONTENTS,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_SEGMENT_CONTENTS);
         break;
       default:
         if (maybe_rise_up (plugin, state, &do_break, read_result))
@@ -1763,7 +1862,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       break;
     case EBML_READING_MATROSKA_TAGS_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
       state->state = EBML_READ_ELEMENT;
       switch (eID)
@@ -1771,7 +1870,12 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       case MatroskaID_Tags_Tag:
         state->next_state = EBML_READING_MATROSKA_TAG_CONTENTS;
         clean_ebml_state_matroska_seek (state);
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_TAG_CONTENTS, EBML_READING_MATROSKA_TAGS_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TAGS_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_TAG_CONTENTS,
+                             EBML_READING_MATROSKA_TAGS_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_TAGS_CONTENTS);
         break;
       default:
         if (maybe_rise_up (plugin, state, &do_break, read_result))
@@ -1781,7 +1885,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       break;
     case EBML_READING_MATROSKA_TAG_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       state->state = EBML_READ_ELEMENT;
@@ -1793,7 +1897,12 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         matroska_add_tag (state, NULL, NULL, NULL);
         state->tag_current = state->tag_last;
         state->tag_tree = state->tag_current;
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_SIMPLETAG_CONTENTS, EBML_READING_MATROSKA_TAG_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TAG_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_SIMPLETAG_CONTENTS,
+                             EBML_READING_MATROSKA_TAG_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_TAG_CONTENTS);
         break;
       default:
         if (maybe_rise_up (plugin, state, &do_break, read_result))
@@ -1803,7 +1912,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       break;
     case EBML_READING_MATROSKA_SIMPLETAG_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       do_break = 0;
@@ -1823,7 +1932,12 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         state->next_state = EBML_READING_MATROSKA_SIMPLETAG_CONTENTS;
         matroska_add_tag (state, state->tag_current, NULL, NULL);
         state->tag_current = state->tag_last;
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_SIMPLETAG_CONTENTS, EBML_READING_MATROSKA_SIMPLETAG_CONTENTS, EBML_READ_ELEMENT, EBML_FINISHED_READING_MATROSKA_SIMPLETAG_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_SIMPLETAG_CONTENTS,
+                             EBML_READING_MATROSKA_SIMPLETAG_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_FINISHED_READING_MATROSKA_SIMPLETAG_CONTENTS);
         do_break = 1;
         break;
       default:
@@ -1838,10 +1952,14 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       if (do_break)
         break;
       state->next_state = EBML_READING_MATROSKA_SIMPLETAG_CONTENTS_VALUE;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_BAD_STATE, EBML_READING_MATROSKA_SIMPLETAG_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SIMPLETAG_CONTENTS);
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_BAD_STATE,
+                           EBML_READING_MATROSKA_SIMPLETAG_CONTENTS,
+                           EBML_READ_ELEMENT,
+                           EBML_READING_MATROSKA_SIMPLETAG_CONTENTS);
       break;
     case EBML_READING_MATROSKA_SIMPLETAG_CONTENTS_VALUE:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       /* This breaks the specs, as there should be only one instance of each
@@ -1861,10 +1979,11 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         state->tag_current->string = strdup (string_value);
         break;
       }
-      rise_up_after_value (plugin, state, EBML_READING_MATROSKA_SIMPLETAG_CONTENTS);
+      rise_up_after_value (plugin, state,
+                           EBML_READING_MATROSKA_SIMPLETAG_CONTENTS);
       break;
     case EBML_READING_MATROSKA_SEEK_HEAD_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       state->state = EBML_READ_ELEMENT;
@@ -1873,7 +1992,12 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       case MatroskaID_Seek:
         state->next_state = EBML_READING_MATROSKA_SEEK_CONTENTS;
         clean_ebml_state_matroska_seek (state);
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_SEEK_CONTENTS, EBML_READING_MATROSKA_SEEK_HEAD_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SEEK_HEAD_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_SEEK_CONTENTS,
+                             EBML_READING_MATROSKA_SEEK_HEAD_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_SEEK_HEAD_CONTENTS);
         break;
       default:
         if (maybe_rise_up (plugin, state, &do_break, read_result))
@@ -1883,7 +2007,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       break;
     case EBML_READING_MATROSKA_SEEK_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       do_break = 0;
@@ -1907,10 +2031,13 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       if (do_break)
         break;
       state->next_state = EBML_READING_MATROSKA_SEEK_CONTENTS_VALUE;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_BAD_STATE, EBML_READING_MATROSKA_SEEK_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_SEEK_CONTENTS);
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_BAD_STATE, EBML_READING_MATROSKA_SEEK_CONTENTS,
+                           EBML_READ_ELEMENT,
+                           EBML_READING_MATROSKA_SEEK_CONTENTS);
       break;
     case EBML_READING_MATROSKA_SEEK_CONTENTS_VALUE:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       /* This breaks the specs, as there should be only one instance of each
@@ -1929,7 +2056,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       rise_up_after_value (plugin, state, EBML_READING_MATROSKA_SEEK_CONTENTS);
       break;
     case EBML_READING_MATROSKA_TRACKS_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       state->state = EBML_READ_ELEMENT;
@@ -1938,7 +2065,12 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       case MatroskaID_Tracks_TrackEntry:
         state->next_state = EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS;
         clean_ebml_state_matroska_track (state);
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_TRACK_ENTRY_CONTENTS, EBML_READING_MATROSKA_TRACKS_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TRACKS_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_TRACK_ENTRY_CONTENTS,
+                             EBML_READING_MATROSKA_TRACKS_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_TRACKS_CONTENTS);
         break;
       default:
         if (maybe_rise_up (plugin, state, &do_break, read_result))
@@ -1948,7 +2080,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       break;
     case EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       do_break = 0;
@@ -1967,14 +2099,24 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         state->state = EBML_READ_ELEMENT;
         state->next_state = EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS;
         clean_ebml_state_matroska_track_video (state);
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS, EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS,
+                             EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
         do_break = 1;
         break;
       case MatroskaID_Tracks_Audio:
         state->state = EBML_READ_ELEMENT;
         state->next_state = EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS;
         clean_ebml_state_matroska_track_audio (state);
-        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_FINISHED_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS, EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
+        ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize,
+                             read_result,
+                             EBML_FINISHED_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS,
+                             EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS,
+                             EBML_READ_ELEMENT,
+                             EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
         do_break = 1;
         break;
       default:
@@ -1989,10 +2131,14 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       if (do_break)
         break;
       state->next_state = EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS_VALUE;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_BAD_STATE, EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_BAD_STATE,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS,
+                           EBML_READ_ELEMENT,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
       break;
     case EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       do_break = 0;
@@ -2017,11 +2163,16 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       if (do_break)
         break;
-      state->next_state = EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS_VALUE;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_BAD_STATE, EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS);
+      state->next_state =
+        EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS_VALUE;
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_BAD_STATE,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS,
+                           EBML_READ_ELEMENT,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS);
       break;
     case EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS_VALUE:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       /* This breaks the specs, as there should be only one instance of each
@@ -2043,10 +2194,11 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         state->matroska_track_audio_bit_depth = uint_value;
         break;
       }
-      rise_up_after_value (plugin, state, EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS);
+      rise_up_after_value (plugin, state,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_AUDIO_CONTENTS);
       break;
     case EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       do_break = 0;
@@ -2072,11 +2224,16 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       }
       if (do_break)
         break;
-      state->next_state = EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS_VALUE;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_BAD_STATE, EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS);
+      state->next_state =
+        EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS_VALUE;
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_BAD_STATE,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS,
+                           EBML_READ_ELEMENT,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS);
       break;
     case EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS_VALUE:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       /* This breaks the specs, as there should be only one instance of each
@@ -2107,10 +2264,11 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         state->matroska_track_video_display_unit = uint_value;
         break;
       }
-      rise_up_after_value (plugin, state, EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS);
+      rise_up_after_value (plugin, state,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_VIDEO_CONTENTS);
       break;
     case EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS_VALUE:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       /* This breaks the specs, as there should be only one instance of each
@@ -2143,10 +2301,11 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
         state->matroska_track_codec_name = strdup (string_value);
         break; /* UTF-8-encoded. A human-readable string specifying the codec. */
       }
-      rise_up_after_value (plugin, state, EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
+      rise_up_after_value (plugin, state,
+                           EBML_READING_MATROSKA_TRACK_ENTRY_CONTENTS);
       break;
     case EBML_READING_MATROSKA_INFO_CONTENTS:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       do_break = 0;
@@ -2178,10 +2337,13 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       if (do_break)
         break;
       state->next_state = EBML_READING_MATROSKA_INFO_CONTENTS_VALUE;
-      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result, EBML_BAD_STATE, EBML_READING_MATROSKA_INFO_CONTENTS, EBML_READ_ELEMENT, EBML_READING_MATROSKA_INFO_CONTENTS);
+      ebml_stack_push_new (state, pl_get_pos (plugin), eID, eSize, read_result,
+                           EBML_BAD_STATE, EBML_READING_MATROSKA_INFO_CONTENTS,
+                           EBML_READ_ELEMENT,
+                           EBML_READING_MATROSKA_INFO_CONTENTS);
       break;
     case EBML_READING_MATROSKA_INFO_CONTENTS_VALUE:
-      if (!check_result (plugin, read_result, state))
+      if (! check_result (plugin, read_result, state))
         break;
 
       /* This breaks the specs, as there should be only one instance of each
@@ -2219,7 +2381,10 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       rise_up_after_value (plugin, state, EBML_READING_MATROSKA_INFO_CONTENTS);
       break;
     case EBML_FINISHED_READING_MATROSKA_INFO_CONTENTS:
-      if (state->stack_top != NULL && pl_get_pos (plugin) >= state->stack_top->position + state->stack_top->header_size + state->stack_top->size)
+      if ((state->stack_top != NULL) && (pl_get_pos (plugin) >=
+                                         state->stack_top->position
+                                         + state->stack_top->header_size
+                                         + state->stack_top->size) )
         report_state (state, proc, proc_cls);
       maybe_seek_to_something_interesting (plugin, state);
       state->state = EBML_READ_ELEMENT;
@@ -2227,7 +2392,10 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       free (ebml_stack_pop (state));
       break;
     case EBML_FINISHED_READING_MATROSKA_TRACK_ENTRY_CONTENTS:
-      if (state->stack_top != NULL && pl_get_pos (plugin) >= state->stack_top->position + state->stack_top->header_size + state->stack_top->size)
+      if ((state->stack_top != NULL) && (pl_get_pos (plugin) >=
+                                         state->stack_top->position
+                                         + state->stack_top->header_size
+                                         + state->stack_top->size) )
         report_state (state, proc, proc_cls);
       state->state = EBML_READ_ELEMENT;
       state->next_state = state->stack_top->prev_state;
@@ -2235,7 +2403,8 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin, EXTRACTOR_Me
       break;
     case EBML_FINISHED_READING_MATROSKA_SEEK_CONTENTS:
       if ((state->matroska_seek_id != 0) &&
-          ((state->matroska_seek_position > 0) || state->matroska_seeks_tail == NULL))
+          ((state->matroska_seek_position > 0) || (state->matroska_seeks_tail ==
+                                                   NULL) ))
       {
         struct matroska_seek_list *el;
         el = malloc (sizeof (struct matroska_seek_list));