g722: Return 8 bits per sample for g722 in av_get_bits_per_sample
authorMartin Storsjö <martin@martin.st>
Sun, 10 Apr 2011 17:06:50 +0000 (20:06 +0300)
committerMartin Storsjö <martin@martin.st>
Mon, 11 Apr 2011 08:35:43 +0000 (11:35 +0300)
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@martin.st>
libavcodec/utils.c

index 12561d0..427e9e4 100644 (file)
@@ -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: