projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
51c3861
)
Make avcodec_string() and av_get_bits_per_sample() report the sample size for CODEC_I...
author
Peter Ross
<pross@xvid.org>
Mon, 4 Aug 2008 07:40:07 +0000
(07:40 +0000)
committer
Peter Ross
<pross@xvid.org>
Mon, 4 Aug 2008 07:40:07 +0000
(07:40 +0000)
Originally committed as revision 14532 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
1c98c31
..
5992261
100644
(file)
--- 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: