[FFmpeg-devel,2/2] aiff: add explicit goto got_sound

Submitted by misty@brew.sh on Jan. 5, 2018, 9:06 a.m.

Details

Message ID 20180105090649.76346-3-misty@brew.sh
State New
Headers show

Commit Message

misty@brew.sh Jan. 5, 2018, 9:06 a.m.
From: Misty De Meo <mistydemeo@gmail.com>

---
 Changelog             | 1 +
 libavformat/aiffdec.c | 3 +++
 2 files changed, 4 insertions(+)

Comments

Michael Niedermayer Jan. 6, 2018, 1:29 a.m.
On Fri, Jan 05, 2018 at 08:06:49PM +1100, misty@brew.sh wrote:
> From: Misty De Meo <mistydemeo@gmail.com>
> 
> ---
>  Changelog             | 1 +
>  libavformat/aiffdec.c | 3 +++
>  2 files changed, 4 insertions(+)

will apply

thanks

[...]

Patch hide | download patch | download mbox

diff --git a/Changelog b/Changelog
index 3d966c202b..63007a259d 100644
--- a/Changelog
+++ b/Changelog
@@ -33,6 +33,7 @@  version <next>:
 - deconvolve video filter
 - entropy video filter
 - hilbert audio filter source
+- aiff: add support for CD-ROM XA ADPCM
 
 
 version 3.4:
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index a6c180fc8d..e87fbc5661 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -332,6 +332,9 @@  static int aiff_read_header(AVFormatContext *s)
             /* This field is unknown and its data seems to be irrelevant */
             avio_rb32(pb);
             st->codecpar->block_align = avio_rb32(pb);
+
+            goto got_sound;
+            break;
         case 0:
             if (offset > 0 && st->codecpar->block_align) // COMM && SSND
                 goto got_sound;