The AAC demuxer now depends on id3v1.o.

[ffmpeg] / libavformat / oggparsespeex.c

diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index e6d9d3682617334f32c42866b6ae515b76782aed..140a58a9eb4b0c04eef32cd3886149d96d423b1f 100644 (file)
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -45,8 +45,10 @@ static int speex_header(AVFormatContext *s, int idx) {
 
         st->codec->sample_rate = AV_RL32(p + 36);
         st->codec->channels = AV_RL32(p + 48);
+        st->codec->frame_size = AV_RL32(p + 56);
         st->codec->extradata_size = os->psize;
-        st->codec->extradata = av_malloc(st->codec->extradata_size);
+        st->codec->extradata = av_malloc(st->codec->extradata_size
+                                         + FF_INPUT_BUFFER_PADDING_SIZE);
         memcpy(st->codec->extradata, p, st->codec->extradata_size);
 
         st->time_base.num = 1;