[SCM] libav/experimental: In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp

[siretart at users.alioth.debian.org]

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

    In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp
    
    Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b1ad714..3465576 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -659,6 +659,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
     if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
                  (tag == MKTAG('d','v','c','p') ||
                   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
         if (track->enc->codec_id == CODEC_ID_DVVIDEO)
             tag = mov_get_dv_codec_tag(s, track);

-- 
Libav/FFmpeg packaging