comparison sonic.c @ 7776:dbcdd0165e55 libavcodec

Replace generic CONFIG_DECODERS preprocessor conditionals by more specific CONFIG_FOO_DECODER conditionals where appropriate.
author diego
date Tue, 02 Sep 2008 23:25:57 +0000
parents 85ab7655ad4d
children 6efb15a24e91
comparison
equal deleted inserted replaced
7775:490ee89408c5 7776:dbcdd0165e55
748 flush_put_bits(&pb); 748 flush_put_bits(&pb);
749 return (put_bits_count(&pb)+7)/8; 749 return (put_bits_count(&pb)+7)/8;
750 } 750 }
751 #endif //CONFIG_ENCODERS 751 #endif //CONFIG_ENCODERS
752 752
753 #ifdef CONFIG_DECODERS 753 #ifdef CONFIG_SONIC_DECODER
754 static av_cold int sonic_decode_init(AVCodecContext *avctx) 754 static av_cold int sonic_decode_init(AVCodecContext *avctx)
755 { 755 {
756 SonicContext *s = avctx->priv_data; 756 SonicContext *s = avctx->priv_data;
757 GetBitContext gb; 757 GetBitContext gb;
758 int i, version; 758 int i, version;
933 933
934 *data_size = s->frame_size * 2; 934 *data_size = s->frame_size * 2;
935 935
936 return (get_bits_count(&gb)+7)/8; 936 return (get_bits_count(&gb)+7)/8;
937 } 937 }
938 #endif 938 #endif /* CONFIG_SONIC_DECODER */
939 939
940 #ifdef CONFIG_ENCODERS 940 #ifdef CONFIG_ENCODERS
941 AVCodec sonic_encoder = { 941 AVCodec sonic_encoder = {
942 "sonic", 942 "sonic",
943 CODEC_TYPE_AUDIO, 943 CODEC_TYPE_AUDIO,
961 NULL, 961 NULL,
962 .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), 962 .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"),
963 }; 963 };
964 #endif 964 #endif
965 965
966 #ifdef CONFIG_DECODERS 966 #ifdef CONFIG_SONIC_DECODER
967 AVCodec sonic_decoder = { 967 AVCodec sonic_decoder = {
968 "sonic", 968 "sonic",
969 CODEC_TYPE_AUDIO, 969 CODEC_TYPE_AUDIO,
970 CODEC_ID_SONIC, 970 CODEC_ID_SONIC,
971 sizeof(SonicContext), 971 sizeof(SonicContext),