diff options
| author | Martin Storsjö <martin@martin.st> | 2011-04-10 20:06:50 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-04-11 11:35:43 +0300 |
| commit | 029f966c3aa73531a90cb14ca95057f2fb3f0a26 (patch) | |
| tree | dc39f0035573f17fc4f7fe81b39dcd7328949cc5 /libavcodec/utils.c | |
| parent | d1c5fdf8920b75f3b824368b8336f18c74b68803 (diff) | |
| download | ffmpeg-029f966c3aa73531a90cb14ca95057f2fb3f0a26.tar.gz | |
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@martin.st>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 12561d0e32..427e9e4200 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: |