[SCM] libav/experimental: set alac channels from extradata, fix alac mono in m4a

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a15328249d8244c5a60b9740709fc88e4964080f
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Dec 18 09:17:19 2008 +0000

    set alac channels from extradata, fix alac mono in m4a
    
    Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index dd44bab..e196365 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1033,8 +1033,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
         st->codec->block_align = sc->bytes_per_frame;
         break;
     case CODEC_ID_ALAC:
-        if (st->codec->extradata_size == 36)
+        if (st->codec->extradata_size == 36) {
             st->codec->frame_size = AV_RB32((st->codec->extradata+12));
+            st->codec->channels   = AV_RB8  (st->codec->extradata+21);
+        }
         break;
     default:
         break;

-- 
Libav/FFmpeg packaging