diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-03-13 23:10:42 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-03-13 23:10:42 +0000 |
| commit | e2e712e7c133978c1758cdebba537646ce5c363a (patch) | |
| tree | 7bafd3ce33370a57bd6540bbf4615c760a85dd58 /libavcodec | |
| parent | 0c3c674cde386a00bcb4446444520ace5c2aed6a (diff) | |
10^10l to whoever wrote this
Originally committed as revision 8394 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pcm.c | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 6cc4719a18..5570c01bd1 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -74,11 +74,8 @@ static int ulaw2linear(unsigned char u_val) } /* 16384 entries per table */ -static uint8_t *linear_to_alaw = NULL; -static int linear_to_alaw_ref = 0; - -static uint8_t *linear_to_ulaw = NULL; -static int linear_to_ulaw_ref = 0; +static uint8_t linear_to_alaw[16384]; +static uint8_t linear_to_ulaw[16384]; static void build_xlaw_table(uint8_t *linear_to_xlaw, int (*xlaw2linear)(unsigned char), @@ -109,22 +106,10 @@ static int pcm_encode_init(AVCodecContext *avctx) avctx->frame_size = 1; switch(avctx->codec->id) { case CODEC_ID_PCM_ALAW: - if (linear_to_alaw_ref == 0) { - linear_to_alaw = av_malloc(16384); - if (!linear_to_alaw) - return -1; - build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); - } - linear_to_alaw_ref++; + build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); break; case CODEC_ID_PCM_MULAW: - if (linear_to_ulaw_ref == 0) { - linear_to_ulaw = av_malloc(16384); - if (!linear_to_ulaw) - return -1; - build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); - } - linear_to_ulaw_ref++; + build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); break; default: break; @@ -170,19 +155,6 @@ static int pcm_encode_close(AVCodecContext *avctx) { av_freep(&avctx->coded_frame); - switch(avctx->codec->id) { - case CODEC_ID_PCM_ALAW: - if (--linear_to_alaw_ref == 0) - av_free(linear_to_alaw); - break; - case CODEC_ID_PCM_MULAW: - if (--linear_to_ulaw_ref == 0) - av_free(linear_to_ulaw); - break; - default: - /* nothing to free */ - break; - } return 0; } |