aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2008-08-04 07:40:07 +0000
committerPeter Ross <pross@xvid.org>2008-08-04 07:40:07 +0000
commit9d49b8ff90a40e6fdde30f30d42465c754fbf5d3 (patch)
tree8899d66b606cca81a6c9791e3f7e2044575620bb /libavcodec
parent51c3861e1663a1e4e9ea465176e68d82e98cc6e9 (diff)
downloadffmpeg-9d49b8ff90a40e6fdde30f30d42465c754fbf5d3.tar.gz
Make avcodec_string() and av_get_bits_per_sample() report the sample size for CODEC_ID_PCM_ZORK
Originally committed as revision 14532 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 1c98c312f0..599226145a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1181,6 +1181,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
case CODEC_ID_PCM_U8:
case CODEC_ID_PCM_ALAW:
case CODEC_ID_PCM_MULAW:
+ case CODEC_ID_PCM_ZORK:
bitrate = enc->sample_rate * enc->channels * 8;
break;
default:
@@ -1290,6 +1291,7 @@ int av_get_bits_per_sample(enum CodecID codec_id){
case CODEC_ID_PCM_MULAW:
case CODEC_ID_PCM_S8:
case CODEC_ID_PCM_U8:
+ case CODEC_ID_PCM_ZORK:
return 8;
case CODEC_ID_PCM_S16BE:
case CODEC_ID_PCM_S16LE: