RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Baptiste Coudurier 2011-01-07 19:56:31 +00:00
parent fea714ecd9
commit a2b7ed3274
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/movenc.c
View File

@ -657,7 +657,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
int tag = track->enc->codec_tag; int tag = track->enc->codec_tag;
if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && 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_RAWVIDEO ||
track->enc->codec_id == CODEC_ID_H263 || track->enc->codec_id == CODEC_ID_H263 ||
av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio