Mercurial > libavcodec.hg
comparison sonic.c @ 11560:8a4984c5cacc libavcodec
Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.
author | stefano |
---|---|
date | Tue, 30 Mar 2010 23:30:55 +0000 |
parents | 4ebcb6c121e4 |
children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
11559:444f4b594fdb | 11560:8a4984c5cacc |
---|---|
935 return (get_bits_count(&gb)+7)/8; | 935 return (get_bits_count(&gb)+7)/8; |
936 } | 936 } |
937 | 937 |
938 AVCodec sonic_decoder = { | 938 AVCodec sonic_decoder = { |
939 "sonic", | 939 "sonic", |
940 CODEC_TYPE_AUDIO, | 940 AVMEDIA_TYPE_AUDIO, |
941 CODEC_ID_SONIC, | 941 CODEC_ID_SONIC, |
942 sizeof(SonicContext), | 942 sizeof(SonicContext), |
943 sonic_decode_init, | 943 sonic_decode_init, |
944 NULL, | 944 NULL, |
945 sonic_decode_close, | 945 sonic_decode_close, |
949 #endif /* CONFIG_SONIC_DECODER */ | 949 #endif /* CONFIG_SONIC_DECODER */ |
950 | 950 |
951 #if CONFIG_SONIC_ENCODER | 951 #if CONFIG_SONIC_ENCODER |
952 AVCodec sonic_encoder = { | 952 AVCodec sonic_encoder = { |
953 "sonic", | 953 "sonic", |
954 CODEC_TYPE_AUDIO, | 954 AVMEDIA_TYPE_AUDIO, |
955 CODEC_ID_SONIC, | 955 CODEC_ID_SONIC, |
956 sizeof(SonicContext), | 956 sizeof(SonicContext), |
957 sonic_encode_init, | 957 sonic_encode_init, |
958 sonic_encode_frame, | 958 sonic_encode_frame, |
959 sonic_encode_close, | 959 sonic_encode_close, |
963 #endif | 963 #endif |
964 | 964 |
965 #if CONFIG_SONIC_LS_ENCODER | 965 #if CONFIG_SONIC_LS_ENCODER |
966 AVCodec sonic_ls_encoder = { | 966 AVCodec sonic_ls_encoder = { |
967 "sonicls", | 967 "sonicls", |
968 CODEC_TYPE_AUDIO, | 968 AVMEDIA_TYPE_AUDIO, |
969 CODEC_ID_SONIC_LS, | 969 CODEC_ID_SONIC_LS, |
970 sizeof(SonicContext), | 970 sizeof(SonicContext), |
971 sonic_encode_init, | 971 sonic_encode_init, |
972 sonic_encode_frame, | 972 sonic_encode_frame, |
973 sonic_encode_close, | 973 sonic_encode_close, |