override mov fourcc for pcm audio, this is safer when stream copying

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18355 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index fe74cd04f6624972fff969ac5ace8eaad038bb1d..2c159e1d760807f6d72970906c78671823335c91 100644 (file)
--- 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');