diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 41153553cf84b4905554f7393d718d29349fb9aa..0eedfba88ca34724d35801c59ce52a0e18c70d6a 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;
         }