[FFmpeg-cvslog] r11653 - trunk/libavformat/movenc.c

[bcoudurier]

Author: bcoudurier
Date: Mon Jan 28 17:58:42 2008
New Revision: 11653

Log:
spoke too fast, fix dv fourcc in mov accordingly if strict

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	(original)
+++ trunk/libavformat/movenc.c	Mon Jan 28 17:58:42 2008
@@ -494,7 +494,8 @@ static int mov_find_codec_tag(AVFormatCo
         else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
     } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) {
         tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id);
-    } else if (!tag) { // do not override tag for mov
+    } 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)