[FFmpeg-cvslog] gsm: use av_get_bytes_per_sample() in frame_bytes calculation

Justin Ruggles git at videolan.org
Thu Nov 3 02:23:09 CET 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Fri Oct 28 00:31:11 2011 -0400| [d9c6eece21dfecb510e33738092f7a43fc7d36f8] | committer: Justin Ruggles

gsm: use av_get_bytes_per_sample() in frame_bytes calculation

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

 libavcodec/gsmdec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c
index 7c247a6..57286c7 100644
--- a/libavcodec/gsmdec.c
+++ b/libavcodec/gsmdec.c
@@ -58,7 +58,8 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data,
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
     int16_t *samples = data;
-    int frame_bytes = 2 * avctx->frame_size;
+    int frame_bytes = avctx->frame_size *
+                      av_get_bytes_per_sample(avctx->sample_fmt);
 
     if (*data_size < frame_bytes)
         return -1;



More information about the ffmpeg-cvslog mailing list