[FFmpeg-cvslog] r17748 - in trunk/libavcodec: flac.h flacdec.c

[jbr]

Author: jbr
Date: Tue Mar  3 06:25:23 2009
New Revision: 17748

Log:
flacdec: Remove unused variable, min_blocksize.

Modified:
   trunk/libavcodec/flac.h
   trunk/libavcodec/flacdec.c

Modified: trunk/libavcodec/flac.h
==============================================================================
--- trunk/libavcodec/flac.h	Tue Mar  3 06:22:44 2009	(r17747)
+++ trunk/libavcodec/flac.h	Tue Mar  3 06:25:23 2009	(r17748)
@@ -52,7 +52,6 @@ enum FLACExtradataFormat {
  * and/or the FLAC decoder.
  */
 #define FLACSTREAMINFO \
-    int min_blocksize;      /**< minimum block size, in samples          */\
     int max_blocksize;      /**< maximum block size, in samples          */\
     int max_framesize;      /**< maximum frame size, in bytes            */\
     int samplerate;         /**< sample rate                             */\

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Tue Mar  3 06:22:44 2009	(r17747)
+++ trunk/libavcodec/flacdec.c	Tue Mar  3 06:25:23 2009	(r17748)
@@ -150,8 +150,7 @@ static av_cold int flac_decode_init(AVCo
 
 static void dump_headers(AVCodecContext *avctx, FLACStreaminfo *s)
 {
-    av_log(avctx, AV_LOG_DEBUG, "  Blocksize: %d .. %d\n", s->min_blocksize,
-           s->max_blocksize);
+    av_log(avctx, AV_LOG_DEBUG, "  Max Blocksize: %d\n", s->max_blocksize);
     av_log(avctx, AV_LOG_DEBUG, "  Max Framesize: %d\n", s->max_framesize);
     av_log(avctx, AV_LOG_DEBUG, "  Samplerate: %d\n", s->samplerate);
     av_log(avctx, AV_LOG_DEBUG, "  Channels: %d\n", s->channels);
@@ -187,7 +186,7 @@ void ff_flac_parse_streaminfo(AVCodecCon
     init_get_bits(&gb, buffer, FLAC_STREAMINFO_SIZE*8);
 
     /* mandatory streaminfo */
-    s->min_blocksize = get_bits(&gb, 16);
+    skip_bits(&gb, 16); /* skip min blocksize */
     s->max_blocksize = get_bits(&gb, 16);
 
     skip_bits(&gb, 24); /* skip min frame size */