From: Zdenek Kabelac Date: Thu, 31 Oct 2002 12:23:35 +0000 (+0000) Subject: * always set extradata_size X-Git-Tag: v0.5~17129 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cb146fafa5d368e634a79aa17be47c6b5c7ce550;p=coroid%2Flibav_saccubus.git * always set extradata_size Originally committed as revision 1129 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libav/wav.c b/libav/wav.c index 172a5cbf1..672bd323f 100644 --- a/libav/wav.c +++ b/libav/wav.c @@ -106,7 +106,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int has_extra_data) { - int id, bps, size; + int id, bps; id = get_le16(pb); codec->codec_type = CODEC_TYPE_AUDIO; @@ -119,11 +119,10 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, bps = get_le16(pb); /* bits per sample */ codec->codec_id = wav_codec_get_id(id, bps); if (has_extra_data) { - size = get_le16(pb); - if (size > 0) { - codec->extradata = av_mallocz(size); - get_buffer(pb, codec->extradata, size); - codec->extradata_size = size; + codec->extradata_size = get_le16(pb); + if (codec->extradata_size > 0) { + codec->extradata = av_mallocz(codec->extradata_size); + get_buffer(pb, codec->extradata, codec->extradata_size); } } }