diff options
| author | Michael Niedermayer <[email protected]> | 2020-10-22 18:18:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2021-02-02 14:18:21 +0100 |
| commit | 837477a755aa0da3e4dfa83a8c40f3bed7c35bea (patch) | |
| tree | a3939366c6056df8df65ab0f546ee8e800ee91b8 | |
| parent | 7da5efcf70f8a066f0a86ed932990550d793f252 (diff) | |
avformat/segafilm: Do not assume AV_CODEC_ID_NONE is 0
Suggested-by: Andreas Rheinhardt <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit d34e4904cd6d965693b285713660f4e84200d60b)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/segafilm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 0ac9f32320..01422bdee6 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -144,11 +144,11 @@ static int film_read_header(AVFormatContext *s) film->video_type = AV_CODEC_ID_NONE; } - if (!film->video_type && !film->audio_type) + if (film->video_type == AV_CODEC_ID_NONE && film->audio_type == AV_CODEC_ID_NONE) return AVERROR_INVALIDDATA; /* initialize the decoder streams */ - if (film->video_type) { + if (film->video_type != AV_CODEC_ID_NONE) { st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -169,7 +169,7 @@ static int film_read_header(AVFormatContext *s) } } - if (film->audio_type) { + if (film->audio_type != AV_CODEC_ID_NONE) { st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -244,7 +244,7 @@ static int film_read_header(AVFormatContext *s) film->sample_table[i].pts = AV_RB32(&scratch[8]) & 0x7FFFFFFF; film->sample_table[i].keyframe = (scratch[8] & 0x80) ? 0 : AVINDEX_KEYFRAME; video_frame_counter++; - if (film->video_type) + if (film->video_type != AV_CODEC_ID_NONE) av_add_index_entry(s->streams[film->video_stream_index], film->sample_table[i].sample_offset, film->sample_table[i].pts, @@ -253,10 +253,10 @@ static int film_read_header(AVFormatContext *s) } } - if (film->audio_type) + if (film->audio_type != AV_CODEC_ID_NONE) s->streams[film->audio_stream_index]->duration = audio_frame_counter; - if (film->video_type) + if (film->video_type != AV_CODEC_ID_NONE) s->streams[film->video_stream_index]->duration = video_frame_counter; film->current_sample = 0; |