tweaks to the MD5 routines; they need to be exported when building a windows DLL...

[platform/upstream/flac.git] / src / libFLAC / seekable_stream_decoder.c

diff --git a/src/libFLAC/seekable_stream_decoder.c b/src/libFLAC/seekable_stream_decoder.c
index ede2312..c142c26 100644 (file)
--- a/src/libFLAC/seekable_stream_decoder.c
+++ b/src/libFLAC/seekable_stream_decoder.c
@@ -68,7 +68,7 @@ typedef struct FLAC__SeekableStreamDecoderPrivate {
        void *client_data;
        FLAC__StreamDecoder *stream_decoder;
        FLAC__bool do_md5_checking; /* initially gets protected_->md5_checking but is turned off after a seek */
-       struct MD5Context md5context;
+       struct FLAC__MD5Context md5context;
        FLAC__byte stored_md5sum[16]; /* this is what is stored in the metadata */
        FLAC__byte computed_md5sum[16]; /* this is the sum we computed from the decoded data */
        /* the rest of these are only used for seeking: */
@@ -205,13 +205,13 @@ FLAC_API FLAC__SeekableStreamDecoderState FLAC__seekable_stream_decoder_init(FLA
 
        decoder->private_->do_md5_checking = decoder->protected_->md5_checking;
 
-       /* We initialize the MD5Context even though we may never use it.  This is
-        * because md5 checking may be turned on to start and then turned off if a
-        * seek occurs.  So we always init the context here and finalize it in
+       /* We initialize the FLAC__MD5Context even though we may never use it.  This
+        * is because md5 checking may be turned on to start and then turned off if
+        * a seek occurs.  So we always init the context here and finalize it in
         * FLAC__seekable_stream_decoder_finish() to make sure things are always
         * cleaned up properly.
         */
-       MD5Init(&decoder->private_->md5context);
+       FLAC__MD5Init(&decoder->private_->md5context);
 
        FLAC__stream_decoder_set_read_callback(decoder->private_->stream_decoder, read_callback_);
        FLAC__stream_decoder_set_write_callback(decoder->private_->stream_decoder, write_callback_);
@@ -246,9 +246,9 @@ FLAC_API FLAC__bool FLAC__seekable_stream_decoder_finish(FLAC__SeekableStreamDec
        FLAC__ASSERT(0 != decoder->private_->stream_decoder);
 
        /* see the comment in FLAC__seekable_stream_decoder_init() as to why we
-        * always call MD5Final()
+        * always call FLAC__MD5Final()
         */
-       MD5Final(decoder->private_->computed_md5sum, &decoder->private_->md5context);
+       FLAC__MD5Final(decoder->private_->computed_md5sum, &decoder->private_->md5context);
 
        FLAC__stream_decoder_finish(decoder->private_->stream_decoder);
 
@@ -574,13 +574,13 @@ FLAC_API FLAC__bool FLAC__seekable_stream_decoder_reset(FLAC__SeekableStreamDeco
 
        decoder->private_->do_md5_checking = decoder->protected_->md5_checking;
 
-       /* We initialize the MD5Context even though we may never use it.  This is
-        * because md5 checking may be turned on to start and then turned off if a
-        * seek occurs.  So we always init the context here and finalize it in
+       /* We initialize the FLAC__MD5Context even though we may never use it.  This
+        * is because md5 checking may be turned on to start and then turned off if
+        * a seek occurs.  So we always init the context here and finalize it in
         * FLAC__seekable_stream_decoder_finish() to make sure things are always
         * cleaned up properly.
         */
-       MD5Init(&decoder->private_->md5context);
+       FLAC__MD5Init(&decoder->private_->md5context);
 
        decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_OK;