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

[bcoudurier]

Author: bcoudurier
Date: Fri Jan  7 20:56:31 2011
New Revision: 26257

Log:
In mov muxer, override codec tag for dv in mov, fix remuxing from avi

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Fri Jan  7 20:55:22 2011	(r26256)
+++ trunk/libavformat/movenc.c	Fri Jan  7 20:56:31 2011	(r26257)
@@ -657,7 +657,7 @@ static int mov_get_codec_tag(AVFormatCon
     int tag = track->enc->codec_tag;
 
     if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
-                 (tag == MKTAG('d','v','c','p') ||
+                 (track->enc->codec_id == CODEC_ID_DVVIDEO ||
                   track->enc->codec_id == CODEC_ID_RAWVIDEO ||
                   track->enc->codec_id == CODEC_ID_H263 ||
                   av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio