diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-28 12:06:12 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-28 12:06:12 +0100 |
| commit | 2eb38991c6d67e47ef90246b2561588cf4b5f390 (patch) | |
| tree | aa84497e9b719c9a2c1a5bf8657a3cdcae32c9d6 /gst/jp2kdecimator | |
| parent | 670c883f401367e2591f446e63b5102cb2aba72f (diff) | |
| parent | a68137c4dcdbf3dce5cd278403478aef1de62f59 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
win32/common/config.h
Diffstat (limited to 'gst/jp2kdecimator')
| -rw-r--r-- | gst/jp2kdecimator/jp2kcodestream.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gst/jp2kdecimator/jp2kcodestream.c b/gst/jp2kdecimator/jp2kcodestream.c index e5c67e0d8..cbff65414 100644 --- a/gst/jp2kdecimator/jp2kcodestream.c +++ b/gst/jp2kdecimator/jp2kcodestream.c @@ -413,8 +413,8 @@ init_packet_iterator (GstJP2kDecimator * self, PacketIterator * it, it->n_layers = (tile->cod) ? tile->cod->n_layers : header->cod.n_layers; it->n_resolutions = 1 + - ((tile->cod) ? tile->cod->n_decompositions : header-> - cod.n_decompositions); + ((tile->cod) ? tile->cod->n_decompositions : header->cod. + n_decompositions); it->n_components = header->siz.n_components; it->tx0 = tile->tx0; @@ -457,8 +457,8 @@ init_packet_iterator (GstJP2kDecimator * self, PacketIterator * it, } order = - (tile->cod) ? tile->cod->progression_order : header-> - cod.progression_order; + (tile->cod) ? tile->cod->progression_order : header->cod. + progression_order; if (order == PROGRESSION_ORDER_LRCP) { it->next = packet_iterator_next_lrcp; } else if (order == PROGRESSION_ORDER_RLCP) { @@ -574,8 +574,8 @@ parse_cod (GstJP2kDecimator * self, GstByteReader * reader, } Scod = gst_byte_reader_get_uint8_unchecked (reader); - cod->sop = ! !(Scod & 0x02); - cod->eph = ! !(Scod & 0x04); + cod->sop = !!(Scod & 0x02); + cod->eph = !!(Scod & 0x04); /* SGcod */ cod->progression_order = gst_byte_reader_get_uint8_unchecked (reader); @@ -642,8 +642,8 @@ write_cod (GstJP2kDecimator * self, GstByteWriter * writer, /* Scod */ tmp = - (cod->PPx ? 0x01 : 0x00) | (cod-> - sop ? 0x02 : 0x00) | (cod->eph ? 0x04 : 0x00); + (cod->PPx ? 0x01 : 0x00) | (cod->sop ? 0x02 : 0x00) | (cod-> + eph ? 0x04 : 0x00); gst_byte_writer_put_uint8_unchecked (writer, tmp); /* SGcod */ @@ -839,8 +839,8 @@ parse_packet (GstJP2kDecimator * self, GstByteReader * reader, const MainHeader * header, Tile * tile, const PacketIterator * it) { GstFlowReturn ret = GST_FLOW_OK; - guint16 marker, length; - guint16 seqno; + guint16 marker = 0, length; + guint16 seqno = 0; guint packet_start_pos; const guint8 *packet_start_data; gboolean sop, eph; @@ -1031,7 +1031,7 @@ parse_tile (GstJP2kDecimator * self, GstByteReader * reader, const MainHeader * header, Tile * tile) { GstFlowReturn ret = GST_FLOW_OK; - guint16 marker, length; + guint16 marker = 0, length; if (!gst_byte_reader_peek_uint16_be (reader, &marker)) { GST_ERROR_OBJECT (self, "Could not read marker"); @@ -1425,7 +1425,7 @@ parse_main_header (GstJP2kDecimator * self, GstByteReader * reader, MainHeader * header) { GstFlowReturn ret = GST_FLOW_OK; - guint16 marker, length; + guint16 marker = 0, length = 0; /* First SOC */ if (!gst_byte_reader_get_uint16_be (reader, &marker) |