Commit 9d49b8ff authored by Peter Ross's avatar Peter Ross

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
parent 51c3861e
...@@ -1181,6 +1181,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) ...@@ -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_U8:
case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_ALAW:
case CODEC_ID_PCM_MULAW: case CODEC_ID_PCM_MULAW:
case CODEC_ID_PCM_ZORK:
bitrate = enc->sample_rate * enc->channels * 8; bitrate = enc->sample_rate * enc->channels * 8;
break; break;
default: default:
...@@ -1290,6 +1291,7 @@ int av_get_bits_per_sample(enum CodecID codec_id){ ...@@ -1290,6 +1291,7 @@ int av_get_bits_per_sample(enum CodecID codec_id){
case CODEC_ID_PCM_MULAW: case CODEC_ID_PCM_MULAW:
case CODEC_ID_PCM_S8: case CODEC_ID_PCM_S8:
case CODEC_ID_PCM_U8: case CODEC_ID_PCM_U8:
case CODEC_ID_PCM_ZORK:
return 8; return 8;
case CODEC_ID_PCM_S16BE: case CODEC_ID_PCM_S16BE:
case CODEC_ID_PCM_S16LE: case CODEC_ID_PCM_S16LE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment