[SCM] libav/experimental: flacdec: Remove unused variable, min_blocksize.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:40:18 UTC 2013


The following commit has been merged in the experimental branch:
commit 95db6659d8b2d3d10c044ce1feab1f2041df8fb3
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Tue Mar 3 05:25:23 2009 +0000

    flacdec: Remove unused variable, min_blocksize.
    
    Originally committed as revision 17748 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index 8af79f2..5d20c0b 100644
--- a/libavcodec/flac.h
+++ b/libavcodec/flac.h
@@ -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                             */\
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 79c2142..c89c96b 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -150,8 +150,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
 
 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(AVCodecContext *avctx, struct FLACStreaminfo *s,
     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 */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list