[Ffmpeg-devel] [PATCH] wav tag

[Michael Niedermayer]

Hi

On Wed, Mar 01, 2006 at 12:16:12PM +0100, Baptiste COUDURIER wrote:
> Hi,
> 
> This patch enforce wav header to search for a tag based on codec. When
> stream copy, mov demuxer assigns tag as the fourcc(twos, in24, in32,
> raw, etc) which is wrong for wav. That ensure that a valid tag is chosen
> for the codec, if the codec is valid.
> 
> -- 
> Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
> SMARTJOG S.A.                                    http://www.smartjog.com
> Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
> Phone: +33 1 49966312

> Index: libavformat/wav.c
> ===================================================================
> RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/wav.c,v
> retrieving revision 1.60
> diff -u -p -r1.60 wav.c
> --- libavformat/wav.c	12 Jan 2006 22:43:26 -0000	1.60
> +++ libavformat/wav.c	1 Mar 2006 11:13:52 -0000
> @@ -56,8 +56,7 @@ int put_wav_header(ByteIOContext *pb, AV
>      int bps, blkalign, bytespersec;
>      int hdrsize = 18;
>  
> -    if(!enc->codec_tag)
> -       enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id);
> +    enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id);

rejected, a muxer MUST always honor codec_tag, the bug is that codec_tag is
blindly copied from the demuxer to the muxer context

[...]

-- 
Michael