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
This commit is contained in:
Baptiste Coudurier 2011-01-07 19:55:08 +00:00
parent 2a12706710
commit 10d8eac98d

View File

@ -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);