From: bcoudurier Date: Tue, 7 Apr 2009 22:31:53 +0000 (+0000) Subject: cosmetics, reindent X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/8cc02f84d780d33449802656a27f7d0c564dd7fb cosmetics, reindent git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18369 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 59e3cf6ee..a2ddba825 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -657,25 +657,25 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) else if (track->enc->codec_id == CODEC_ID_RAWVIDEO) tag = mov_get_rawvideo_codec_tag(s, track); else if (track->enc->codec_type == CODEC_TYPE_VIDEO) { - tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id); - if (!tag) { // if no mac fcc found, try with Microsoft tags - tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id); - if (tag) - av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, " - "the file may be unplayable!\n"); - } - } else if (track->enc->codec_type == CODEC_TYPE_AUDIO) { - tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id); - if (!tag) { // if no mac fcc found, try with Microsoft tags - int ms_tag = codec_get_tag(codec_wav_tags, track->enc->codec_id); - if (ms_tag) { - tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff)); - av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, " - "the file may be unplayable!\n"); - } + tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id); + if (!tag) { // if no mac fcc found, try with Microsoft tags + tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id); + if (tag) + av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, " + "the file may be unplayable!\n"); + } + } else if (track->enc->codec_type == CODEC_TYPE_AUDIO) { + tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id); + if (!tag) { // if no mac fcc found, try with Microsoft tags + int ms_tag = codec_get_tag(codec_wav_tags, track->enc->codec_id); + if (ms_tag) { + tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff)); + av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, " + "the file may be unplayable!\n"); } - } else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) - tag = codec_get_tag(ff_codec_movsubtitle_tags, track->enc->codec_id); + } + } else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) + tag = codec_get_tag(ff_codec_movsubtitle_tags, track->enc->codec_id); } return tag;