diff options
author | Andy Wingo <wingo@pobox.com> | 2002-03-19 04:10:06 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2002-03-19 04:10:06 +0000 |
commit | 4359de26166000e317604b6b20283c79dd2a0521 (patch) | |
tree | bc587b41e92b76e4f12e5e11984989e4e89d9935 /ext/tarkin | |
parent | 0dc999da00ffc311ee1fc040ab754dab6660f2c7 (diff) | |
download | gst-plugins-bad-4359de26166000e317604b6b20283c79dd2a0521.tar.gz gst-plugins-bad-4359de26166000e317604b6b20283c79dd2a0521.tar.bz2 gst-plugins-bad-4359de26166000e317604b6b20283c79dd2a0521.zip |
removal of //-style comments don't link plugins to core libs -- the versioning is done internally to the plugins with...
Original commit message from CVS:
* removal of //-style comments
* don't link plugins to core libs -- the versioning is done internally to the plugins with the plugin_info struct,
and symbol resolution is lazy, so we can always know if a plugin can be loaded by the plugin_info data. in theory.
Diffstat (limited to 'ext/tarkin')
-rw-r--r-- | ext/tarkin/Makefile.am | 2 | ||||
-rw-r--r-- | ext/tarkin/bitcoder.h | 4 | ||||
-rw-r--r-- | ext/tarkin/golomb.h | 2 | ||||
-rw-r--r-- | ext/tarkin/info.c | 2 | ||||
-rw-r--r-- | ext/tarkin/tarkin.c | 2 | ||||
-rw-r--r-- | ext/tarkin/wavelet_coeff.c | 8 |
6 files changed, 10 insertions, 10 deletions
diff --git a/ext/tarkin/Makefile.am b/ext/tarkin/Makefile.am index a10409fc..6bfe71b1 100644 --- a/ext/tarkin/Makefile.am +++ b/ext/tarkin/Makefile.am @@ -9,7 +9,7 @@ libgsttarkin_la_SOURCES = tarkin.c \ libgsttarkin_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) -DTYPE_BITS=10 -DTYPE=int16_t -DRLECODER ## AM_PATH_VORBIS also sets VORBISENC_LIBS -libgsttarkin_la_LIBADD = $(GST_LIBS) $(VORBIS_LIBS) $(VORBISENC_LIBS) +libgsttarkin_la_LIBADD = $(VORBIS_LIBS) $(VORBISENC_LIBS) libgsttarkin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gsttarkinenc.h mem.h tarkin.h yuv.h wavelet.h diff --git a/ext/tarkin/bitcoder.h b/ext/tarkin/bitcoder.h index f0b8cd69..312cd887 100644 --- a/ext/tarkin/bitcoder.h +++ b/ext/tarkin/bitcoder.h @@ -73,8 +73,8 @@ uint32_t bitcoder_flush (BitCoderState *s) if (s->bit_count > 0 && s->byte_count < s->limit) s->bitstream [s->byte_count++] = s->byte << (8 - s->bit_count); -//printf ("%s: %i bytes written.\n", __FUNCTION__, s->byte_count); -//printf ("%s: last bit %i\n", __FUNCTION__, s->bit_count); +/*printf ("%s: %i bytes written.\n", __FUNCTION__, s->byte_count); */ +/*printf ("%s: last bit %i\n", __FUNCTION__, s->bit_count); */ return s->byte_count; } diff --git a/ext/tarkin/golomb.h b/ext/tarkin/golomb.h index fa66d750..95e63c30 100644 --- a/ext/tarkin/golomb.h +++ b/ext/tarkin/golomb.h @@ -20,7 +20,7 @@ unsigned int required_bits (unsigned int x) static inline void write_number_binary (BitCoderState *b, unsigned int x, int bits, int u) { -//printf ("wrote %i with %i bits (%i+%i)\n", x, u+bits, u, bits); +/*printf ("wrote %i with %i bits (%i+%i)\n", x, u+bits, u, bits); */ while (bits) { bits--; bitcoder_write_bit (b, (x >> bits) & 1); diff --git a/ext/tarkin/info.c b/ext/tarkin/info.c index e555e381..7937a69f 100644 --- a/ext/tarkin/info.c +++ b/ext/tarkin/info.c @@ -270,7 +270,7 @@ static int _tarkin_unpack_layer_desc(TarkinInfo *vi,oggpack_buffer *opb){ } vi->max_bitstream_len += layer->desc.bitstream_len - + 2 * 10 * sizeof(uint32_t) * layer->n_comp; // truncation tables + + 2 * 10 * sizeof(uint32_t) * layer->n_comp; /* truncation tables */ #ifdef DBG_OGG printf("\n layer%d: size %dx%dx%d, format %d, a_m %d, s_m %d, %d fpb\n", diff --git a/ext/tarkin/tarkin.c b/ext/tarkin/tarkin.c index 053c03f7..1804fc5f 100644 --- a/ext/tarkin/tarkin.c +++ b/ext/tarkin/tarkin.c @@ -139,7 +139,7 @@ extern int tarkin_analysis_add_layer(TarkinStream *s, } /* max_bitstream_len += layer->desc.bitstream_len - + 2 * 10 * sizeof(uint32_t) * layer->n_comp; // truncation tables + + 2 * 10 * sizeof(uint32_t) * layer->n_comp; /* truncation tables */ */ return (TARKIN_OK); } diff --git a/ext/tarkin/wavelet_coeff.c b/ext/tarkin/wavelet_coeff.c index 2cc0a8f0..63248676 100644 --- a/ext/tarkin/wavelet_coeff.c +++ b/ext/tarkin/wavelet_coeff.c @@ -57,13 +57,13 @@ TYPE decode_coeff (ENTROPY_CODER significand_bitstream [], do { i--; significance |= INPUT_BIT(&significand_bitstream[i]) << i; -// if (ENTROPY_CODER_EOS(&significand_bitstream[i])) -// return 0; +/* if (ENTROPY_CODER_EOS(&significand_bitstream[i])) */ +/* return 0; */ } while (!significance && i > 0); sign = INPUT_BIT(&significand_bitstream[i]); -// if (ENTROPY_CODER_EOS(&significand_bitstream[i])) -// return 0; +/* if (ENTROPY_CODER_EOS(&significand_bitstream[i])) */ +/* return 0; */ while (--i >= 0) significance |= INPUT_BIT(&insignificand_bitstream[i]) << i; |