Browse Source

flacdec: Remove unused variable, min_blocksize.

Originally committed as revision 17748 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Justin Ruggles 16 years ago
parent
commit
95db6659d8
2 changed files with 2 additions and 4 deletions
  1. +0
    -1
      libavcodec/flac.h
  2. +2
    -3
      libavcodec/flacdec.c

+ 0
- 1
libavcodec/flac.h View File

@@ -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 */\


+ 2
- 3
libavcodec/flacdec.c View File

@@ -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 */


Loading…
Cancel
Save