[FFmpeg-devel] [PATCH]lavf/riff: Do not use a rogue twocc for adpcm_swf

Michael Niedermayer michael at niedermayer.cc
Thu Sep 15 16:42:55 EEST 2016


On Mon, Sep 12, 2016 at 12:52:49PM +0200, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch "fixes" ticket #5829, I am happy if a better 
> solution can be found.
> 
> Please comment, Carl Eugen

>  riff.c |    1 -
>  1 file changed, 1 deletion(-)
> 6113805920f6fb418635029f2f600fcfe1c3fa88  0001-lavf-riff-Do-not-use-a-rogue-twocc-for-adpcm_swf.patch
> From 69d62cac34908fb2a37e37ef1b03b565f2b4ae78 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <cehoyos at ag.or.at>
> Date: Mon, 12 Sep 2016 12:42:33 +0200
> Subject: [PATCH] lavf/riff: Do not use a rogue twocc for adpcm_swf.
> 
> Fixes ticket #5829.
> ---
>  libavformat/riff.c |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/libavformat/riff.c b/libavformat/riff.c
> index 72ad5d9..06f2996 100644
> --- a/libavformat/riff.c
> +++ b/libavformat/riff.c
> @@ -510,7 +510,6 @@ const AVCodecTag ff_codec_wav_tags[] = {
>      { AV_CODEC_ID_AAC,             0xA106 },
>      { AV_CODEC_ID_SPEEX,           0xA109 },
>      { AV_CODEC_ID_FLAC,            0xF1AC },
> -    { AV_CODEC_ID_ADPCM_SWF,       ('S' << 8) + 'F' },
>      /* HACK/FIXME: Does Vorbis in WAV/AVI have an (in)official ID? */
>      { AV_CODEC_ID_VORBIS,          ('V' << 8) + 'o' },
>      { AV_CODEC_ID_NONE,      0 },

does this affect adpcm_swf in nut ? just guessing didnt try
aka should this maybe be moved into a nut specific table ?

[...]


-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160915/6f444e41/attachment.sig>


More information about the ffmpeg-devel mailing list