summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-30 20:27:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-10-30 20:31:06 +0100
commit28bcca46ed668d8cde9a59ff11c6242e0665bfa3 (patch)
tree5ca74758a3c6fe96e4ae5cf7aae17e1f310ed859
parentb90d7840dff8512ec6553b8ab422e477930861f3 (diff)
downloadffmpeg-streaming-28bcca46ed668d8cde9a59ff11c6242e0665bfa3.zip
ffmpeg-streaming-28bcca46ed668d8cde9a59ff11c6242e0665bfa3.tar.gz
av_get_audio_frame_duration: fix IMC
Fixes Ticket1658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 2029b53..9f1abbe 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2391,7 +2391,6 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
case AV_CODEC_ID_GSM:
case AV_CODEC_ID_QCELP:
case AV_CODEC_ID_RA_288: return 160;
- case AV_CODEC_ID_IMC: return 256;
case AV_CODEC_ID_AMR_WB:
case AV_CODEC_ID_GSM_MS: return 320;
case AV_CODEC_ID_MP1: return 384;
@@ -2470,6 +2469,8 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
return 6 * frame_bytes / ch;
case AV_CODEC_ID_PCM_LXF:
return 2 * (frame_bytes / (5 * ch));
+ case AV_CODEC_ID_IMC:
+ return 4 * frame_bytes / ch;
}
if (tag) {
OpenPOWER on IntegriCloud