Mercurial > libavcodec.hg
changeset 8248:45cfe1d44e86 libavcodec
mlp: initialize all CRC tables in a common function.
This way the decoder does not have to depend on the parser being initialized
before.
Patch by Laurent Aimar <fenrir at via dot ecp dot fr>.
| author | ramiro |
|---|---|
| date | Wed, 03 Dec 2008 01:14:06 +0000 |
| parents | e8cb66bdae99 |
| children | 5057047bcc52 |
| files | mlp.c mlp.h mlp_parser.c |
| diffstat | 3 files changed, 8 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mlp.c Tue Dec 02 18:26:55 2008 +0000 +++ b/mlp.c Wed Dec 03 01:14:06 2008 +0000 @@ -43,26 +43,14 @@ static int crc_init = 0; static AVCRC crc_63[1024]; static AVCRC crc_1D[1024]; - - -static int crc_init_2D = 0; static AVCRC crc_2D[1024]; -int av_cold ff_mlp_init_crc2D(AVCodecParserContext *s) -{ - if (!crc_init_2D) { - av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D)); - crc_init_2D = 1; - } - - return 0; -} - void av_cold ff_mlp_init_crc() { if (!crc_init) { av_crc_init(crc_63, 0, 8, 0x63, sizeof(crc_63)); av_crc_init(crc_1D, 0, 8, 0x1D, sizeof(crc_1D)); + av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D)); crc_init = 1; } }
--- a/mlp.h Tue Dec 02 18:26:55 2008 +0000 +++ b/mlp.h Wed Dec 03 01:14:06 2008 +0000 @@ -106,8 +106,6 @@ */ uint8_t ff_mlp_calculate_parity(const uint8_t *buf, unsigned int buf_size); -int ff_mlp_init_crc2D(AVCodecParserContext *s); - void ff_mlp_init_crc(); /** XOR four bytes into one. */
--- a/mlp_parser.c Tue Dec 02 18:26:55 2008 +0000 +++ b/mlp_parser.c Wed Dec 03 01:14:06 2008 +0000 @@ -150,6 +150,12 @@ int num_substreams; } MLPParseContext; +static av_cold int mlp_init(AVCodecParserContext *s) +{ + ff_mlp_init_crc(); + return 0; +} + static int mlp_parse(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, @@ -283,7 +289,7 @@ AVCodecParser mlp_parser = { { CODEC_ID_MLP }, sizeof(MLPParseContext), - ff_mlp_init_crc2D, + mlp_init, mlp_parse, NULL, };