[SCM] libav/experimental: set block align and frame size for gsm in aiff

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5d79f30d703993e4454b29f32e74ebdfa7056a67
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Sep 4 22:35:05 2008 +0000

    set block align and frame size for gsm in aiff
    
    Originally committed as revision 15203 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 4115355..0eedfba 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -141,6 +141,10 @@ static unsigned int get_aiff_header(ByteIOContext *pb, AVCodecContext *codec,
             codec->block_align = 1*codec->channels;
             codec->frame_size = 6;
             break;
+        case CODEC_ID_GSM:
+            codec->block_align = 33;
+            codec->frame_size = 160;
+            break;
         default:
             break;
         }

-- 
Libav/FFmpeg packaging