diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6b9c012bc6..33978ee1b0 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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) { - unsigned int tag; - if (is_cover_image(track->st)) 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 " "Quicktime/Ipod might not play the file\n"); - if (track->mode == MODE_MOV) - tag = mov_get_codec_tag(s, track); - else - tag = validate_codec_tag(s->oformat->codec_tag, track->par->codec_tag, - track->par->codec_id); - return tag; + if (track->mode == MODE_MOV) { + return mov_get_codec_tag(s, track); + } else + return validate_codec_tag(s->oformat->codec_tag, track->par->codec_tag, + track->par->codec_id); } /** Write uuid atom. |