summaryrefslogtreecommitdiff
path: root/libavcodec/pcm.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-09-29 12:12:23 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-10-26 12:01:07 -0400
commit85579b638179f40102c4bcedb8a2dde4cf19f391 (patch)
tree941a9f45e567bb33039d8a369749051dd9fd82d6 /libavcodec/pcm.c
parent67a3b67c717e4e53b9217ec1d579f2dff5e46717 (diff)
avcodec: remove the Zork PCM encoder.
The Zork PCM decoder does not decode the 1 sample we have correctly, therefore the encoder based on the decoder is also incorrect. There is no good reason to keep the encoder.
Diffstat (limited to 'libavcodec/pcm.c')
-rw-r--r--libavcodec/pcm.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index ec2660cbd3..ca3926402a 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -171,15 +171,6 @@ static int pcm_encode_frame(AVCodecContext *avctx,
memcpy(dst, samples, n*sample_size);
dst += n*sample_size;
break;
- case CODEC_ID_PCM_ZORK:
- srcu8 = data;
- for (; n > 0; n--) {
- v = *srcu8++;
- if (v < 128)
- v = 128 - v;
- *dst++ = v;
- }
- break;
case CODEC_ID_PCM_ALAW:
for(;n>0;n--) {
v = *samples++;
@@ -518,4 +509,4 @@ PCM_CODEC (CODEC_ID_PCM_U24BE, AV_SAMPLE_FMT_S32, pcm_u24be, "PCM unsigned 24-b
PCM_CODEC (CODEC_ID_PCM_U24LE, AV_SAMPLE_FMT_S32, pcm_u24le, "PCM unsigned 24-bit little-endian");
PCM_CODEC (CODEC_ID_PCM_U32BE, AV_SAMPLE_FMT_S32, pcm_u32be, "PCM unsigned 32-bit big-endian");
PCM_CODEC (CODEC_ID_PCM_U32LE, AV_SAMPLE_FMT_S32, pcm_u32le, "PCM unsigned 32-bit little-endian");
-PCM_CODEC (CODEC_ID_PCM_ZORK, AV_SAMPLE_FMT_U8, pcm_zork, "PCM Zork");
+PCM_DECODER(CODEC_ID_PCM_ZORK, AV_SAMPLE_FMT_U8, pcm_zork, "PCM Zork");