Mercurial > libavcodec.hg
comparison mlpdec.c @ 10742:1194d0b64bfe libavcodec
Remove pointless CONFIG_MLP_DECODER preprocessor check.
The file is only ever compiled if the MLP decoder is enabled.
| author | diego |
|---|---|
| date | Tue, 29 Dec 2009 17:20:19 +0000 |
| parents | 1052fe7823e8 |
| children | 9aae10c862f7 |
comparison
equal
deleted
inserted
replaced
| 10741:ac0b44158f60 | 10742:1194d0b64bfe |
|---|---|
| 1132 error: | 1132 error: |
| 1133 m->params_valid = 0; | 1133 m->params_valid = 0; |
| 1134 return -1; | 1134 return -1; |
| 1135 } | 1135 } |
| 1136 | 1136 |
| 1137 #if CONFIG_MLP_DECODER | |
| 1138 AVCodec mlp_decoder = { | 1137 AVCodec mlp_decoder = { |
| 1139 "mlp", | 1138 "mlp", |
| 1140 CODEC_TYPE_AUDIO, | 1139 CODEC_TYPE_AUDIO, |
| 1141 CODEC_ID_MLP, | 1140 CODEC_ID_MLP, |
| 1142 sizeof(MLPDecodeContext), | 1141 sizeof(MLPDecodeContext), |
| 1144 NULL, | 1143 NULL, |
| 1145 NULL, | 1144 NULL, |
| 1146 read_access_unit, | 1145 read_access_unit, |
| 1147 .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), | 1146 .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), |
| 1148 }; | 1147 }; |
| 1149 #endif /* CONFIG_MLP_DECODER */ | |
| 1150 | 1148 |
| 1151 #if CONFIG_TRUEHD_DECODER | 1149 #if CONFIG_TRUEHD_DECODER |
| 1152 AVCodec truehd_decoder = { | 1150 AVCodec truehd_decoder = { |
| 1153 "truehd", | 1151 "truehd", |
| 1154 CODEC_TYPE_AUDIO, | 1152 CODEC_TYPE_AUDIO, |