changeset 2981:3c0b2165d82c libavformat

spoke too fast, fix dv fourcc in mov accordingly if strict
author bcoudurier
date Mon, 28 Jan 2008 16:58:42 +0000
parents 672d72727b20
children a039456aa97d
files movenc.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/movenc.c	Mon Jan 28 16:03:50 2008 +0000
+++ b/movenc.c	Mon Jan 28 16:58:42 2008 +0000
@@ -494,7 +494,8 @@
         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)