Mercurial > libavcodec.hg
comparison adpcm.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 | 9b5939c66874 |
| children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
| 11559:444f4b594fdb | 11560:8a4984c5cacc |
|---|---|
| 1636 | 1636 |
| 1637 #if CONFIG_ENCODERS | 1637 #if CONFIG_ENCODERS |
| 1638 #define ADPCM_ENCODER(id,name,long_name_) \ | 1638 #define ADPCM_ENCODER(id,name,long_name_) \ |
| 1639 AVCodec name ## _encoder = { \ | 1639 AVCodec name ## _encoder = { \ |
| 1640 #name, \ | 1640 #name, \ |
| 1641 CODEC_TYPE_AUDIO, \ | 1641 AVMEDIA_TYPE_AUDIO, \ |
| 1642 id, \ | 1642 id, \ |
| 1643 sizeof(ADPCMContext), \ | 1643 sizeof(ADPCMContext), \ |
| 1644 adpcm_encode_init, \ | 1644 adpcm_encode_init, \ |
| 1645 adpcm_encode_frame, \ | 1645 adpcm_encode_frame, \ |
| 1646 adpcm_encode_close, \ | 1646 adpcm_encode_close, \ |
| 1654 | 1654 |
| 1655 #if CONFIG_DECODERS | 1655 #if CONFIG_DECODERS |
| 1656 #define ADPCM_DECODER(id,name,long_name_) \ | 1656 #define ADPCM_DECODER(id,name,long_name_) \ |
| 1657 AVCodec name ## _decoder = { \ | 1657 AVCodec name ## _decoder = { \ |
| 1658 #name, \ | 1658 #name, \ |
| 1659 CODEC_TYPE_AUDIO, \ | 1659 AVMEDIA_TYPE_AUDIO, \ |
| 1660 id, \ | 1660 id, \ |
| 1661 sizeof(ADPCMContext), \ | 1661 sizeof(ADPCMContext), \ |
| 1662 adpcm_decode_init, \ | 1662 adpcm_decode_init, \ |
| 1663 NULL, \ | 1663 NULL, \ |
| 1664 NULL, \ | 1664 NULL, \ |