[FFmpeg-cvslog] g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Martin Storsjö git at videolan.org
Tue Apr 12 03:50:40 CEST 2011


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Apr 10 20:06:50 2011 +0300| [029f966c3aa73531a90cb14ca95057f2fb3f0a26] | committer: Martin Storsjö

g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

This fixes a failing assert in ff_raw_read_header (in
fate-g722dec-1), where bits_per_coded_sample is set using this
function and is required to have a positive value.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavcodec/utils.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 12561d0..427e9e4 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1107,6 +1107,7 @@ int av_get_bits_per_sample(enum CodecID codec_id){
     case CODEC_ID_ADPCM_MS:
     case CODEC_ID_ADPCM_YAMAHA:
         return 4;
+    case CODEC_ID_ADPCM_G722:
     case CODEC_ID_PCM_ALAW:
     case CODEC_ID_PCM_MULAW:
     case CODEC_ID_PCM_S8:



More information about the ffmpeg-cvslog mailing list