[SCM] libav/experimental: override mov fourcc for pcm audio, this is safer when stream copying

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 50d2d05d3436922e89fcdfdd87411669eab61c02
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Tue Apr 7 20:37:30 2009 +0000

    override mov fourcc for pcm audio, this is safer when stream copying
    
    Originally committed as revision 18355 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index fe74cd0..2c159e1 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');

-- 
Libav/FFmpeg packaging