Mercurial > libavcodec.hg
comparison utils.c @ 7475:eaf0ebba81d7 libavcodec
Make avcodec_string() and av_get_bits_per_sample() report the sample size for CODEC_ID_PCM_ZORK
author | pross |
---|---|
date | Mon, 04 Aug 2008 07:40:07 +0000 |
parents | bb5e8cae1d71 |
children | 398636f16e7e |
comparison
equal
deleted
inserted
replaced
7474:9ed1ef44127b | 7475:eaf0ebba81d7 |
---|---|
1179 break; | 1179 break; |
1180 case CODEC_ID_PCM_S8: | 1180 case CODEC_ID_PCM_S8: |
1181 case CODEC_ID_PCM_U8: | 1181 case CODEC_ID_PCM_U8: |
1182 case CODEC_ID_PCM_ALAW: | 1182 case CODEC_ID_PCM_ALAW: |
1183 case CODEC_ID_PCM_MULAW: | 1183 case CODEC_ID_PCM_MULAW: |
1184 case CODEC_ID_PCM_ZORK: | |
1184 bitrate = enc->sample_rate * enc->channels * 8; | 1185 bitrate = enc->sample_rate * enc->channels * 8; |
1185 break; | 1186 break; |
1186 default: | 1187 default: |
1187 bitrate = enc->bit_rate; | 1188 bitrate = enc->bit_rate; |
1188 break; | 1189 break; |
1288 return 4; | 1289 return 4; |
1289 case CODEC_ID_PCM_ALAW: | 1290 case CODEC_ID_PCM_ALAW: |
1290 case CODEC_ID_PCM_MULAW: | 1291 case CODEC_ID_PCM_MULAW: |
1291 case CODEC_ID_PCM_S8: | 1292 case CODEC_ID_PCM_S8: |
1292 case CODEC_ID_PCM_U8: | 1293 case CODEC_ID_PCM_U8: |
1294 case CODEC_ID_PCM_ZORK: | |
1293 return 8; | 1295 return 8; |
1294 case CODEC_ID_PCM_S16BE: | 1296 case CODEC_ID_PCM_S16BE: |
1295 case CODEC_ID_PCM_S16LE: | 1297 case CODEC_ID_PCM_S16LE: |
1296 case CODEC_ID_PCM_S16LE_PLANAR: | 1298 case CODEC_ID_PCM_S16LE_PLANAR: |
1297 case CODEC_ID_PCM_U16BE: | 1299 case CODEC_ID_PCM_U16BE: |