diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-12 03:43:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-12 03:48:21 +0200 |
| commit | 4727ec3c0e64b9144006abf82e080fb734ad4b0a (patch) | |
| tree | c00962593119265e5dcb70fd70a2a12f623fb559 /libavcodec/utils.c | |
| parent | 13d4ec844a7e0e46da42c3ab152e5c3efe0897e3 (diff) | |
| parent | db46be01ecf44608932cfa33e8914a4c38b93431 (diff) | |
| download | ffmpeg-4727ec3c0e64b9144006abf82e080fb734ad4b0a.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
Fix compilation of timefilter test program.
Add support for AMR-WB encoding via libvo-amrwbenc
Add an AAC encoder by using the libvo-aacenc library
g722: Return 8 bits per sample for g722 in av_get_bits_per_sample
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 bd5bdfd383..a6fb871ade 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1165,6 +1165,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: |