warning is only valid for mov

[ffmpeg] / libavformat / movenc.c

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index df41b6e96ec9ccaab52205769df04c9cd7859320..b94b674034d625356aa3fd27a3f2985fe25e52e3 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -497,37 +497,29 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
     } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
                         tag == MKTAG('d','v','c','p'))) {
         if (track->enc->codec_id == CODEC_ID_DVVIDEO) {
-            if (track->enc->height == 480) { /* NTSC */
-                if (track->enc->pix_fmt == PIX_FMT_YUV422P)
-                    tag = MKTAG('d', 'v', '5', 'n');
-                else
-                    tag = MKTAG('d', 'v', 'c', ' ');
-            } else { /* assume PAL */
-                if (track->enc->pix_fmt == PIX_FMT_YUV422P)
-                    tag = MKTAG('d', 'v', '5', 'p');
-                else if (track->enc->pix_fmt == PIX_FMT_YUV420P)
-                    tag = MKTAG('d', 'v', 'c', 'p');
-                else
-                    tag = MKTAG('d', 'v', 'p', 'p');
-            }
+            if (track->enc->height == 480) /* NTSC */
+                if  (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n');
+                else                                         tag = MKTAG('d','v','c',' ');
+            else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p');
+            else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p');
+            else                                             tag = MKTAG('d','v','p','p');
         } else {
             if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
                 tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
-                // if no mac fcc found, try with Microsoft tags
-                if (!tag) {
+                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");
-                    }
+                    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 no mac fcc found, try with Microsoft tags
-                if (!tag) {
+                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");
+                        av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, "
+                               "the file may be unplayable!\n");
                     }
                 }
             }
@@ -1472,7 +1464,7 @@ static int mov_write_header(AVFormatContext *s)
         if(st->codec->codec_type == CODEC_TYPE_VIDEO){
             track->timescale = st->codec->time_base.den;
             av_set_pts_info(st, 64, 1, st->codec->time_base.den);
-            if (track->timescale > 100000)
+            if (track->mode == MODE_MOV && track->timescale > 100000)
                 av_log(NULL, AV_LOG_WARNING,
                        "WARNING codec timebase is very high. If duration is too long,\n"
                        "file may not be playable by quicktime. Specify a shorter timebase\n"