highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/movenc: Remove unneeded variable from mov_find_codec_tag()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2018-09-19 18:05:25 +02:00
parent 8c49340b18
commit 52e62b0585
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/movenc.c
View File

@@ -1611,8 +1611,6 @@ static unsigned int validate_codec_tag(const AVCodecTag *const *tags,
static unsigned int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) static unsigned int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
{ {
unsigned int tag;
if (is_cover_image(track->st)) if (is_cover_image(track->st))
return ff_codec_get_tag(codec_cover_image_tags, track->par->codec_id); return ff_codec_get_tag(codec_cover_image_tags, track->par->codec_id);
@@ -1623,12 +1621,11 @@ static unsigned int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v "
"Quicktime/Ipod might not play the file\n"); "Quicktime/Ipod might not play the file\n");
if (track->mode == MODE_MOV) if (track->mode == MODE_MOV) {
tag = mov_get_codec_tag(s, track); return mov_get_codec_tag(s, track);
else } else
tag = validate_codec_tag(s->oformat->codec_tag, track->par->codec_tag, return validate_codec_tag(s->oformat->codec_tag, track->par->codec_tag,
track->par->codec_id); track->par->codec_id);
return tag;
} }
/** Write uuid atom. /** Write uuid atom.