frsh: Export information about the last RTP contract and VRES

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

diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c
index bcce6749ea21c07ef7b7f2d190cf054ec5b5cd08..43ee6b1e21801f2cdbefe9f7b13ab82014e447a7 100644 (file)
--- a/libavformat/tiertexseq.c
+++ b/libavformat/tiertexseq.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file tiertexseq.c
+ * @file libavformat/tiertexseq.c
  * Tiertex Limited SEQ file demuxer
  */
 
@@ -68,7 +68,7 @@ static int seq_probe(AVProbeData *p)
     /* there's no real header in a .seq file, the only thing they have in common */
     /* is the first 256 bytes of the file which are always filled with 0 */
     for (i = 0; i < 256; i++)
-        if (p->buf[i] != 0)
+        if (p->buf[i])
             return 0;
 
     if(p->buf[256]==0 && p->buf[257]==0)
@@ -110,7 +110,7 @@ static int seq_fill_buffer(SeqDemuxContext *seq, ByteIOContext *pb, int buffer_n
         return AVERROR_INVALIDDATA;
 
     seq_buffer = &seq->frame_buffers[buffer_num];
-    if (seq_buffer->fill_size + data_size > seq_buffer->data_size)
+    if (seq_buffer->fill_size + data_size > seq_buffer->data_size || data_size <= 0)
         return AVERROR_INVALIDDATA;
 
     url_fseek(pb, seq->current_frame_offs + data_offs, SEEK_SET);
@@ -132,7 +132,7 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, ByteIOContext *pb)
 
     /* sound data */
     seq->current_audio_data_offs = get_le16(pb);
-    if (seq->current_audio_data_offs != 0) {
+    if (seq->current_audio_data_offs) {
         seq->current_audio_data_size = SEQ_AUDIO_BUFFER_SIZE * 2;
     } else {
         seq->current_audio_data_size = 0;
@@ -140,7 +140,7 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, ByteIOContext *pb)
 
     /* palette data */
     seq->current_pal_data_offs = get_le16(pb);
-    if (seq->current_pal_data_offs != 0) {
+    if (seq->current_pal_data_offs) {
         seq->current_pal_data_size = 768;
     } else {
         seq->current_pal_data_size = 0;
@@ -154,12 +154,12 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, ByteIOContext *pb)
         offset_table[i] = get_le16(pb);
 
     for (i = 0; i < 3; i++) {
-        if (offset_table[i] != 0) {
+        if (offset_table[i]) {
             for (e = i + 1; e < 3 && offset_table[e] == 0; e++);
             err = seq_fill_buffer(seq, pb, buffer_num[1 + i],
               offset_table[i],
               offset_table[e] - offset_table[i]);
-            if (err != 0)
+            if (err)
                 return err;
         }
     }
@@ -230,9 +230,9 @@ static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap)
     st->codec->codec_tag = 0;  /* no tag */
     st->codec->channels = 1;
     st->codec->sample_rate = SEQ_SAMPLE_RATE;
-    st->codec->bits_per_sample = 16;
-    st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample * st->codec->channels;
-    st->codec->block_align = st->codec->channels * st->codec->bits_per_sample;
+    st->codec->bits_per_coded_sample = 16;
+    st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels;
+    st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
 
     return 0;
 }
@@ -254,13 +254,13 @@ static int seq_read_packet(AVFormatContext *s, AVPacket *pkt)
                 return AVERROR(ENOMEM);
 
             pkt->data[0] = 0;
-            if (seq->current_pal_data_size != 0) {
+            if (seq->current_pal_data_size) {
                 pkt->data[0] |= 1;
                 url_fseek(pb, seq->current_frame_offs + seq->current_pal_data_offs, SEEK_SET);
                 if (get_buffer(pb, &pkt->data[1], seq->current_pal_data_size) != seq->current_pal_data_size)
                     return AVERROR(EIO);
             }
-            if (seq->current_video_data_size != 0) {
+            if (seq->current_video_data_size) {
                 pkt->data[0] |= 2;
                 memcpy(&pkt->data[1 + seq->current_pal_data_size],
                   seq->current_video_data_ptr,
@@ -285,7 +285,7 @@ static int seq_read_packet(AVFormatContext *s, AVPacket *pkt)
         return rc;
 
     pkt->stream_index = seq->audio_stream_index;
-    pkt->pts = seq->current_frame_pts++;
+    seq->current_frame_pts++;
 
     seq->audio_buffer_full = 0;
     return 0;
@@ -304,7 +304,7 @@ static int seq_read_close(AVFormatContext *s)
 
 AVInputFormat tiertexseq_demuxer = {
     "tiertexseq",
-    "Tiertex Limited SEQ format",
+    NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"),
     sizeof(SeqDemuxContext),
     seq_probe,
     seq_read_header,