Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-16 04:57:11 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-08-16 04:57:11 +0400
commit747774ece9b0cdb4e67118408a1bb244f29d1d75 (patch)
treede3551a818b0c3b5ece386b69384efea2678afdf
parent6ecf1eb0ddad4732fa90cbec1b13d9f3d2efa940 (diff)
av_get_audio_frame_duration: fix ra144
Fixes Ticket1612 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 7608551036..53759f2e6f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2187,7 +2187,6 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
case AV_CODEC_ID_AMR_NB:
case AV_CODEC_ID_GSM:
case AV_CODEC_ID_QCELP:
- case AV_CODEC_ID_RA_144:
case AV_CODEC_ID_RA_288: return 160;
case AV_CODEC_ID_IMC: return 256;
case AV_CODEC_ID_AMR_WB:
@@ -2235,6 +2234,8 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
return 240 * (frame_bytes / 32);
if (id == AV_CODEC_ID_NELLYMOSER)
return 256 * (frame_bytes / 64);
+ if (id == AV_CODEC_ID_RA_144)
+ return 160 * (frame_bytes / 20);
if (bps > 0) {
/* calc from frame_bytes and bits_per_coded_sample */