From 50d2d05d3436922e89fcdfdd87411669eab61c02 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Tue, 7 Apr 2009 20:37:30 +0000 Subject: [PATCH] override mov fourcc for pcm audio, this is safer when stream copying Originally committed as revision 18355 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/movenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index fe74cd04f6..2c159e1d76 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -602,7 +602,8 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id); } else 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_RAWVIDEO || + av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio if (track->enc->codec_id == CODEC_ID_DVVIDEO) { if (track->enc->height == 480) /* NTSC */ if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n');