mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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
This commit is contained in:
parent
fea714ecd9
commit
a2b7ed3274
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user