diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/utils.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/utils.c | 57 |
1 files changed, 1 insertions, 56 deletions
diff --git a/src/libffmpeg/libavcodec/utils.c b/src/libffmpeg/libavcodec/utils.c index aef27e342..f84b17e63 100644 --- a/src/libffmpeg/libavcodec/utils.c +++ b/src/libffmpeg/libavcodec/utils.c @@ -270,24 +270,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) enc->sample_rate, enc->channels == 2 ? "stereo" : "mono"); } - /* for PCM codecs, compute bitrate directly */ - switch(enc->codec_id) { - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_U16BE: - bitrate = enc->sample_rate * enc->channels * 16; - break; - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_U8: - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: - bitrate = enc->sample_rate * enc->channels * 8; - break; - default: - bitrate = enc->bit_rate; - break; - } + bitrate = enc->bit_rate; break; default: abort(); @@ -390,20 +373,6 @@ void avcodec_init(void) /* simple call to use all the codecs */ void avcodec_register_all(void) { - /* encoders */ -#ifdef CONFIG_ENCODERS - register_avcodec(&ac3_encoder); - register_avcodec(&mp2_encoder); - register_avcodec(&mpeg1video_encoder); - register_avcodec(&h263_encoder); - register_avcodec(&h263p_encoder); - register_avcodec(&rv10_encoder); - register_avcodec(&mjpeg_encoder); - register_avcodec(&mpeg4_encoder); - register_avcodec(&msmpeg4_encoder); -#endif /* CONFIG_ENCODERS */ - register_avcodec(&rawvideo_codec); - /* decoders */ #ifdef CONFIG_DECODERS register_avcodec(&h263_decoder); @@ -413,32 +382,8 @@ void avcodec_register_all(void) register_avcodec(&h263i_decoder); register_avcodec(&rv10_decoder); register_avcodec(&mjpeg_decoder); -#ifdef FF_AUDIO_CODECS - register_avcodec(&mp3_decoder); -#ifdef CONFIG_AC3 - register_avcodec(&ac3_decoder); -#endif -#endif #endif /* CONFIG_DECODERS */ -#ifdef FF_AUDIO_CODECS - /* pcm codecs */ - -#define PCM_CODEC(id, name) \ - register_avcodec(& name ## _encoder); \ - register_avcodec(& name ## _decoder); \ - -PCM_CODEC(CODEC_ID_PCM_S16LE, pcm_s16le); -PCM_CODEC(CODEC_ID_PCM_S16BE, pcm_s16be); -PCM_CODEC(CODEC_ID_PCM_U16LE, pcm_u16le); -PCM_CODEC(CODEC_ID_PCM_U16BE, pcm_u16be); -PCM_CODEC(CODEC_ID_PCM_S8, pcm_s8); -PCM_CODEC(CODEC_ID_PCM_U8, pcm_u8); -PCM_CODEC(CODEC_ID_PCM_ALAW, pcm_alaw); -PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw); - -#undef PCM_CODEC -#endif } static int encode_init(AVCodecContext *s) |