[FFmpeg-cvslog] Support iLBC in caf.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Nov 19 10:19:50 2012 +0100| [a5d4e94a97a692e55fa47d8a60f79fb827d15315] | committer: Carl Eugen Hoyos

Support iLBC in caf.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5d4e94a97a692e55fa47d8a60f79fb827d15315
---

 libavformat/caf.c    |    1 +
 libavformat/cafenc.c |    1 +
 2 files changed, 2 insertions(+)

diff --git a/libavformat/caf.c b/libavformat/caf.c
index 5f490d8..c1ecc94 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 cc39a83..92b61c9 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: