virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avformat/segafilmenc: Remove redundant checks

Browse Source 
If an audio stream is present, the Sega FILM muxer checks for its
compability with the container during init, so that the very same check
needn't be repeated during writing the trailer.

Essentially the same is true for the presence of a video stream: It has
already been checked during init. Furthermore, after the check for the
presence of a video stream succeeded, a pointer is set to point to the
video stream. Yet said pointer (which was NULL before) will be
derefenced anyway regardless of the result of the check. Coverity thus
complained about this in CID 1434155 and removing this pointless check
will also fix this issue.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2020-01-14 04:13:34 +01:00 committed by Michael Niedermayer
parent c116dd8468
commit c790500644
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/segafilmenc.c
View File

@ -292,15 +292,9 @@ static int film_write_header(AVFormatContext *format_context)
if (film->audio_index > -1)
audio = format_context->streams[film->audio_index];
if (film->video_index > -1)
video = format_context->streams[film->video_index];
if (audio != NULL) {
audio_codec = get_audio_codec_id(audio->codecpar->codec_id);
if (audio_codec < 0) {
av_log(format_context, AV_LOG_ERROR, "Incompatible audio stream format.\n");
return AVERROR(EINVAL);
}
}
/* First, write the FILM header; this is very simple */
@ -317,6 +311,8 @@ static int film_write_header(AVFormatContext *format_context)
ffio_wfourcc(pb, "FDSC");
avio_wb32(pb, 0x20); /* Size of FDSC chunk */
video = format_context->streams[film->video_index];
/* The only two supported codecs; raw video is rare */
switch (video->codecpar->codec_id) {
case AV_CODEC_ID_CINEPAK: