[SCM] libav/experimental: In mov muxer, override codec tag for dv in mov, fix remuxing from avi

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a2b7ed3274b2b575f6d2e8fd3bf0a6a1818b2c1e
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Jan 7 19:56:31 2011 +0000

    In mov muxer, override codec tag for dv in mov, fix remuxing from avi
    
    Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3465576..5230938 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -657,7 +657,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
     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

-- 
Libav/FFmpeg packaging