From 95db6659d8b2d3d10c044ce1feab1f2041df8fb3 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Tue, 3 Mar 2009 05:25:23 +0000
Subject: [PATCH] flacdec: Remove unused variable, min_blocksize.
Originally committed as revision 17748 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/flac.h | 1 -
libavcodec/flacdec.c | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index 8af79f2bd81..5d20c0b9744 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 79c2142237a..c89c96b0b6b 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 */
--
GitLab