diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-05-28 20:33:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-05-28 20:33:22 +0000 |
| commit | ea813b44a81b799bc671c15b3f86c92a95d52e67 (patch) | |
| tree | b2ccdc5f6a64945933633ab25e80db230fc08463 | |
| parent | 591944cd0c4f10ddf0eaee9298553633e12a26d0 (diff) | |
| download | ffmpeg-ea813b44a81b799bc671c15b3f86c92a95d52e67.tar.gz | |
remove != 0
Originally committed as revision 13503 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/tiertexseq.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c index 60ac5ecd7e..88a65fa50c 100644 --- a/libavformat/tiertexseq.c +++ b/libavformat/tiertexseq.c @@ -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) @@ -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; } } @@ -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, |