diff --git a/libavformat/caf.c b/libavformat/caf.c
index 5f490d82d6ced66bcc01416b74b43f9f4920b0cb..c1ecc94425e54368b3378d471552c5d03368e020 100644
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
@@ -44,6 +44,7 @@ const AVCodecTag ff_codec_caf_tags[] = {
   /*{ AV_CODEC_ID_DVAUDIO,         MKTAG('d','v','c','a') },*/
     { AV_CODEC_ID_GSM,             MKTAG('a','g','s','m') },
     { AV_CODEC_ID_GSM_MS,          MKTAG('m','s', 0, '1') },
+    { AV_CODEC_ID_ILBC,            MKTAG('i','l','b','c') },
     { AV_CODEC_ID_MACE3,           MKTAG('M','A','C','3') },
     { AV_CODEC_ID_MACE6,           MKTAG('M','A','C','6') },
     { AV_CODEC_ID_MP1,             MKTAG('.','m','p','1') },
diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index cc39a8341ca391d689bd9722fc8aa8f3bda31873..92b61c9e1e6b79f8e3312e2faeb9f34a21874715 100644
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
@@ -75,6 +75,7 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels) {
         return 64;
     case AV_CODEC_ID_AMR_NB:
     case AV_CODEC_ID_GSM:
+    case AV_CODEC_ID_ILBC:
     case AV_CODEC_ID_QCELP:
         return 160;
     case AV_CODEC_ID_GSM_MS: