Mercurial > libavcodec.hg
comparison libgsm.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 | 76b57b8e2a9a |
| children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
| 11559:444f4b594fdb | 11560:8a4984c5cacc |
|---|---|
| 112 } | 112 } |
| 113 | 113 |
| 114 | 114 |
| 115 AVCodec libgsm_encoder = { | 115 AVCodec libgsm_encoder = { |
| 116 "libgsm", | 116 "libgsm", |
| 117 CODEC_TYPE_AUDIO, | 117 AVMEDIA_TYPE_AUDIO, |
| 118 CODEC_ID_GSM, | 118 CODEC_ID_GSM, |
| 119 0, | 119 0, |
| 120 libgsm_init, | 120 libgsm_init, |
| 121 libgsm_encode_frame, | 121 libgsm_encode_frame, |
| 122 libgsm_close, | 122 libgsm_close, |
| 124 .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), | 124 .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), |
| 125 }; | 125 }; |
| 126 | 126 |
| 127 AVCodec libgsm_ms_encoder = { | 127 AVCodec libgsm_ms_encoder = { |
| 128 "libgsm_ms", | 128 "libgsm_ms", |
| 129 CODEC_TYPE_AUDIO, | 129 AVMEDIA_TYPE_AUDIO, |
| 130 CODEC_ID_GSM_MS, | 130 CODEC_ID_GSM_MS, |
| 131 0, | 131 0, |
| 132 libgsm_init, | 132 libgsm_init, |
| 133 libgsm_encode_frame, | 133 libgsm_encode_frame, |
| 134 libgsm_close, | 134 libgsm_close, |
| 156 return avctx->block_align; | 156 return avctx->block_align; |
| 157 } | 157 } |
| 158 | 158 |
| 159 AVCodec libgsm_decoder = { | 159 AVCodec libgsm_decoder = { |
| 160 "libgsm", | 160 "libgsm", |
| 161 CODEC_TYPE_AUDIO, | 161 AVMEDIA_TYPE_AUDIO, |
| 162 CODEC_ID_GSM, | 162 CODEC_ID_GSM, |
| 163 0, | 163 0, |
| 164 libgsm_init, | 164 libgsm_init, |
| 165 NULL, | 165 NULL, |
| 166 libgsm_close, | 166 libgsm_close, |
| 168 .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), | 168 .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), |
| 169 }; | 169 }; |
| 170 | 170 |
| 171 AVCodec libgsm_ms_decoder = { | 171 AVCodec libgsm_ms_decoder = { |
| 172 "libgsm_ms", | 172 "libgsm_ms", |
| 173 CODEC_TYPE_AUDIO, | 173 AVMEDIA_TYPE_AUDIO, |
| 174 CODEC_ID_GSM_MS, | 174 CODEC_ID_GSM_MS, |
| 175 0, | 175 0, |
| 176 libgsm_init, | 176 libgsm_init, |
| 177 NULL, | 177 NULL, |
| 178 libgsm_close, | 178 libgsm_close, |