[SCM] libav/experimental: cafdec: Handle ALAC extradata.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1e6f8d53fc8153da17ed2e6f2a0bde5a1b8d3419
Author: Peter Ross <pross at xvid.org>
Date:   Sun Oct 10 00:50:37 2010 +0000

    cafdec: Handle ALAC extradata.
    
    This fixes roundup issue 2284.
    
    Originally committed as revision 25430 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index c020579..201c5f2 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -115,6 +115,21 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
             return AVERROR_INVALIDDATA;
         }
         url_fskip(pb, skip);
+    } else if (st->codec->codec_id == CODEC_ID_ALAC) {
+#define ALAC_PREAMBLE 12
+#define ALAC_HEADER   36
+        if (size < ALAC_PREAMBLE + ALAC_HEADER) {
+            av_log(s, AV_LOG_ERROR, "invalid ALAC magic cookie\n");
+            url_fskip(pb, size);
+            return AVERROR_INVALIDDATA;
+        }
+        url_fskip(pb, ALAC_PREAMBLE);
+        st->codec->extradata = av_mallocz(ALAC_HEADER + FF_INPUT_BUFFER_PADDING_SIZE);
+        if (!st->codec->extradata)
+            return AVERROR(ENOMEM);
+        get_buffer(pb, st->codec->extradata, ALAC_HEADER);
+        st->codec->extradata_size = ALAC_HEADER;
+        url_fskip(pb, size - ALAC_PREAMBLE - ALAC_HEADER);
     } else {
         st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
         if (!st->codec->extradata)

-- 
Libav/FFmpeg packaging