Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / rtpdec_g726.c

diff --git a/libavformat/rtpdec_g726.c b/libavformat/rtpdec_g726.c
index 35ca9061fdd0584b70211c382f60ff992196c11e..20450d8dfb6d57cac2b1e64c56d8cf7385a4ce96 100644 (file)
--- a/libavformat/rtpdec_g726.c
+++ b/libavformat/rtpdec_g726.c
@@ -27,10 +27,8 @@ static int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, PayloadCon
     AVStream *stream = s->streams[st_index]; \
     AVCodecContext *codec = stream->codec; \
 \
-    codec->bit_rate = bitrate*1000; \
-    if (codec->sample_rate) \
-        codec->bits_per_coded_sample = \
-            av_clip((codec->bit_rate + codec->sample_rate/2) / codec->sample_rate, 2, 5); \
+    codec->bits_per_coded_sample = bitrate/8; \
+    codec->bit_rate = codec->bits_per_coded_sample * codec->sample_rate; \
 \
     return 0; \
 } \