Mercurial > libavcodec.hg
comparison amr.c @ 2895:8fe1dc88294a libavcodec
Fix some #ifdef to allow building amr_wb alone.
patch by Michel Bardiaux < mbardiaux -- dot -- mediaxim -- dot -- be >
| author | diego |
|---|---|
| date | Sat, 24 Sep 2005 17:42:56 +0000 |
| parents | b17d868a8f39 |
| children | ef2149182f1c |
comparison
equal
deleted
inserted
replaced
| 2894:26f8974c3d66 | 2895:8fe1dc88294a |
|---|---|
| 324 } | 324 } |
| 325 return written; | 325 return written; |
| 326 } | 326 } |
| 327 | 327 |
| 328 | 328 |
| 329 #else /* Float point version*/ | 329 #elif defined(AMR_NB) /* Float point version*/ |
| 330 | 330 |
| 331 typedef struct AMRContext { | 331 typedef struct AMRContext { |
| 332 int frameCount; | 332 int frameCount; |
| 333 void * decState; | 333 void * decState; |
| 334 int *enstate; | 334 int *enstate; |
| 454 | 454 |
| 455 return written; | 455 return written; |
| 456 } | 456 } |
| 457 | 457 |
| 458 #endif | 458 #endif |
| 459 | |
| 460 #if defined(AMR_NB) || defined(AMR_NB_FIXED) | |
| 459 | 461 |
| 460 AVCodec amr_nb_decoder = | 462 AVCodec amr_nb_decoder = |
| 461 { | 463 { |
| 462 "amr_nb", | 464 "amr_nb", |
| 463 CODEC_TYPE_AUDIO, | 465 CODEC_TYPE_AUDIO, |
| 478 amr_nb_encode_init, | 480 amr_nb_encode_init, |
| 479 amr_nb_encode_frame, | 481 amr_nb_encode_frame, |
| 480 amr_nb_encode_close, | 482 amr_nb_encode_close, |
| 481 NULL, | 483 NULL, |
| 482 }; | 484 }; |
| 485 | |
| 486 #endif | |
| 483 | 487 |
| 484 /* -----------AMR wideband ------------*/ | 488 /* -----------AMR wideband ------------*/ |
| 485 #ifdef AMR_WB | 489 #ifdef AMR_WB |
| 486 | 490 |
| 487 #ifdef _TYPEDEF_H | 491 #ifdef _TYPEDEF_H |