You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
* always set extradata_size
Originally committed as revision 1129 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
11
libav/wav.c
11
libav/wav.c
@@ -106,7 +106,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
|
|||||||
void get_wav_header(ByteIOContext *pb, AVCodecContext *codec,
|
void get_wav_header(ByteIOContext *pb, AVCodecContext *codec,
|
||||||
int has_extra_data)
|
int has_extra_data)
|
||||||
{
|
{
|
||||||
int id, bps, size;
|
int id, bps;
|
||||||
|
|
||||||
id = get_le16(pb);
|
id = get_le16(pb);
|
||||||
codec->codec_type = CODEC_TYPE_AUDIO;
|
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 */
|
bps = get_le16(pb); /* bits per sample */
|
||||||
codec->codec_id = wav_codec_get_id(id, bps);
|
codec->codec_id = wav_codec_get_id(id, bps);
|
||||||
if (has_extra_data) {
|
if (has_extra_data) {
|
||||||
size = get_le16(pb);
|
codec->extradata_size = get_le16(pb);
|
||||||
if (size > 0) {
|
if (codec->extradata_size > 0) {
|
||||||
codec->extradata = av_mallocz(size);
|
codec->extradata = av_mallocz(codec->extradata_size);
|
||||||
get_buffer(pb, codec->extradata, size);
|
get_buffer(pb, codec->extradata, codec->extradata_size);
|
||||||
codec->extradata_size = size;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user