frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavformat / siff.c

diff --git a/libavformat/siff.c b/libavformat/siff.c
index 7adccb2ebaeaf2a8aaa32623e1904835f5a1fa75..63fc0d6fac93bc4ed501293fa0c14c225c67ccb0 100644 (file)
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -1,6 +1,6 @@
 /*
  * Beam Software SIFF demuxer
- * Copyright (c) 2007 Konstantin Shishkov.
+ * Copyright (c) 2007 Konstantin Shishkov
  *
  * This file is part of FFmpeg.
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
-#include "riff.h"
 
 enum SIFFTags{
     TAG_SIFF = MKTAG('S', 'I', 'F', 'F'),
@@ -76,7 +76,7 @@ static int create_audio_stream(AVFormatContext *s, SIFFContext *c)
     ast->codec->codec_type      = CODEC_TYPE_AUDIO;
     ast->codec->codec_id        = CODEC_ID_PCM_U8;
     ast->codec->channels        = 1;
-    ast->codec->bits_per_sample = c->bits;
+    ast->codec->bits_per_coded_sample = c->bits;
     ast->codec->sample_rate     = c->rate;
     ast->codec->frame_size      = c->block_align;
     av_set_pts_info(ast, 16, 1, c->rate);
@@ -153,7 +153,7 @@ static int siff_parse_soun(AVFormatContext *s, SIFFContext *c, ByteIOContext *pb
 
 static int siff_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     SIFFContext *c = s->priv_data;
     uint32_t tag;
 
@@ -189,12 +189,12 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
         if (c->cur_frame >= c->frames)
             return AVERROR(EIO);
         if (c->curstrm == -1){
-            c->pktsize = get_le32(&s->pb) - 4;
-            c->flags = get_le16(&s->pb);
+            c->pktsize = get_le32(s->pb) - 4;
+            c->flags = get_le16(s->pb);
             c->gmcsize = (c->flags & VB_HAS_GMC) ? 4 : 0;
             if (c->gmcsize)
-                get_buffer(&s->pb, c->gmc, c->gmcsize);
-            c->sndsize = (c->flags & VB_HAS_AUDIO) ? get_le32(&s->pb): 0;
+                get_buffer(s->pb, c->gmc, c->gmcsize);
+            c->sndsize = (c->flags & VB_HAS_AUDIO) ? get_le32(s->pb): 0;
             c->curstrm = !!(c->flags & VB_HAS_AUDIO);
         }
 
@@ -205,11 +205,11 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
             AV_WL16(pkt->data, c->flags);
             if (c->gmcsize)
                 memcpy(pkt->data + 2, c->gmc, c->gmcsize);
-            get_buffer(&s->pb, pkt->data + 2 + c->gmcsize, size - c->gmcsize - 2);
+            get_buffer(s->pb, pkt->data + 2 + c->gmcsize, size - c->gmcsize - 2);
             pkt->stream_index = 0;
             c->curstrm = -1;
         }else{
-            if (av_get_packet(&s->pb, pkt, c->sndsize - 4) < 0)
+            if (av_get_packet(s->pb, pkt, c->sndsize - 4) < 0)
                 return AVERROR(EIO);
             pkt->stream_index = 1;
             c->curstrm = 0;
@@ -219,7 +219,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
         if (c->curstrm == -1)
             c->cur_frame++;
     }else{
-        size = av_get_packet(&s->pb, pkt, c->block_align);
+        size = av_get_packet(s->pb, pkt, c->block_align);
         if(size <= 0)
             return AVERROR(EIO);
     }
@@ -228,7 +228,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat siff_demuxer = {
     "siff",
-    "Beam Software SIFF",
+    NULL_IF_CONFIG_SMALL("Beam Software SIFF"),
     sizeof(SIFFContext),
     siff_probe,
     siff_read_header,