rtspenc: include os_support.h for system without HAVE_POLL_H

[ffmpeg] / libavformat / oggparsespeex.c

diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 14d2b38131be9540b9dadfabd3d2cf27670f3068..936b37e952e50478c331f6d1ccf67981b4cb957a 100644 (file)
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -32,20 +32,27 @@
 
 struct speex_params {
     int final_packet_duration;
+    int seq;
 };
 
 static int speex_header(AVFormatContext *s, int idx) {
     struct ogg *ogg = s->priv_data;
     struct ogg_stream *os = ogg->streams + idx;
+    struct speex_params *spxp = os->private;
     AVStream *st = s->streams[idx];
     uint8_t *p = os->buf + os->pstart;
 
-    if (os->seq > 1)
+    if (!spxp) {
+        spxp = av_mallocz(sizeof(*spxp));
+        os->private = spxp;
+    }
+
+    if (spxp->seq > 1)
         return 0;
 
-    if (os->seq == 0) {
+    if (spxp->seq == 0) {
         int frames_per_packet;
-        st->codec->codec_type = CODEC_TYPE_AUDIO;
+        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id = CODEC_ID_SPEEX;
 
         st->codec->sample_rate = AV_RL32(p + 36);
@@ -68,8 +75,9 @@ static int speex_header(AVFormatContext *s, int idx) {
         st->time_base.num = 1;
         st->time_base.den = st->codec->sample_rate;
     } else
-        vorbis_comment(s, p, os->psize);
+        ff_vorbis_comment(s, &st->metadata, p, os->psize);
 
+    spxp->seq++;
     return 1;
 }
 
@@ -90,11 +98,6 @@ static int speex_packet(AVFormatContext *s, int idx)
     struct speex_params *spxp = os->private;
     int packet_size = s->streams[idx]->codec->frame_size;
 
-    if (!spxp) {
-        spxp = av_mallocz(sizeof(*spxp));
-        os->private = spxp;
-    }
-
     if (os->flags & OGG_FLAG_EOS && os->lastpts != AV_NOPTS_VALUE &&
         os->granule > 0) {
         /* first packet of final page. we have to calculate the final packet