Mercurial > libavcodec.hg
comparison mpegaudiodec.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 | 1cd8731bbe7f |
| children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
| 11559:444f4b594fdb | 11560:8a4984c5cacc |
|---|---|
| 2483 | 2483 |
| 2484 #if CONFIG_MP1_DECODER | 2484 #if CONFIG_MP1_DECODER |
| 2485 AVCodec mp1_decoder = | 2485 AVCodec mp1_decoder = |
| 2486 { | 2486 { |
| 2487 "mp1", | 2487 "mp1", |
| 2488 CODEC_TYPE_AUDIO, | 2488 AVMEDIA_TYPE_AUDIO, |
| 2489 CODEC_ID_MP1, | 2489 CODEC_ID_MP1, |
| 2490 sizeof(MPADecodeContext), | 2490 sizeof(MPADecodeContext), |
| 2491 decode_init, | 2491 decode_init, |
| 2492 NULL, | 2492 NULL, |
| 2493 NULL, | 2493 NULL, |
| 2499 #endif | 2499 #endif |
| 2500 #if CONFIG_MP2_DECODER | 2500 #if CONFIG_MP2_DECODER |
| 2501 AVCodec mp2_decoder = | 2501 AVCodec mp2_decoder = |
| 2502 { | 2502 { |
| 2503 "mp2", | 2503 "mp2", |
| 2504 CODEC_TYPE_AUDIO, | 2504 AVMEDIA_TYPE_AUDIO, |
| 2505 CODEC_ID_MP2, | 2505 CODEC_ID_MP2, |
| 2506 sizeof(MPADecodeContext), | 2506 sizeof(MPADecodeContext), |
| 2507 decode_init, | 2507 decode_init, |
| 2508 NULL, | 2508 NULL, |
| 2509 NULL, | 2509 NULL, |
| 2515 #endif | 2515 #endif |
| 2516 #if CONFIG_MP3_DECODER | 2516 #if CONFIG_MP3_DECODER |
| 2517 AVCodec mp3_decoder = | 2517 AVCodec mp3_decoder = |
| 2518 { | 2518 { |
| 2519 "mp3", | 2519 "mp3", |
| 2520 CODEC_TYPE_AUDIO, | 2520 AVMEDIA_TYPE_AUDIO, |
| 2521 CODEC_ID_MP3, | 2521 CODEC_ID_MP3, |
| 2522 sizeof(MPADecodeContext), | 2522 sizeof(MPADecodeContext), |
| 2523 decode_init, | 2523 decode_init, |
| 2524 NULL, | 2524 NULL, |
| 2525 NULL, | 2525 NULL, |
| 2531 #endif | 2531 #endif |
| 2532 #if CONFIG_MP3ADU_DECODER | 2532 #if CONFIG_MP3ADU_DECODER |
| 2533 AVCodec mp3adu_decoder = | 2533 AVCodec mp3adu_decoder = |
| 2534 { | 2534 { |
| 2535 "mp3adu", | 2535 "mp3adu", |
| 2536 CODEC_TYPE_AUDIO, | 2536 AVMEDIA_TYPE_AUDIO, |
| 2537 CODEC_ID_MP3ADU, | 2537 CODEC_ID_MP3ADU, |
| 2538 sizeof(MPADecodeContext), | 2538 sizeof(MPADecodeContext), |
| 2539 decode_init, | 2539 decode_init, |
| 2540 NULL, | 2540 NULL, |
| 2541 NULL, | 2541 NULL, |
| 2547 #endif | 2547 #endif |
| 2548 #if CONFIG_MP3ON4_DECODER | 2548 #if CONFIG_MP3ON4_DECODER |
| 2549 AVCodec mp3on4_decoder = | 2549 AVCodec mp3on4_decoder = |
| 2550 { | 2550 { |
| 2551 "mp3on4", | 2551 "mp3on4", |
| 2552 CODEC_TYPE_AUDIO, | 2552 AVMEDIA_TYPE_AUDIO, |
| 2553 CODEC_ID_MP3ON4, | 2553 CODEC_ID_MP3ON4, |
| 2554 sizeof(MP3On4DecodeContext), | 2554 sizeof(MP3On4DecodeContext), |
| 2555 decode_init_mp3on4, | 2555 decode_init_mp3on4, |
| 2556 NULL, | 2556 NULL, |
| 2557 decode_close_mp3on4, | 2557 decode_close_mp3on4, |