diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-03-19 21:23:39 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-03-19 21:23:39 +0000 |
| commit | 9ba4821d933739d923edcb229e7129d939d56d48 (patch) | |
| tree | db07388b1b6d2d7d4bb6d098b574347ab24fc3cb /libavcodec/mlpdec.c | |
| parent | 5c3d507f1a9aff13d93fc851a477ddbb2511bf6f (diff) | |
| download | ffmpeg-9ba4821d933739d923edcb229e7129d939d56d48.tar.gz | |
Split TrueHD decoder from MLP
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 99754b329c..6b825cdea1 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1038,6 +1038,7 @@ error: return -1; } +#if CONFIG_MLP_DECODER AVCodec mlp_decoder = { "mlp", CODEC_TYPE_AUDIO, @@ -1047,6 +1048,20 @@ AVCodec mlp_decoder = { NULL, NULL, read_access_unit, - .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)/TrueHD"), + .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), }; +#endif /* CONFIG_MLP_DECODER */ +#if CONFIG_TRUEHD_DECODER +AVCodec truehd_decoder = { + "truehd", + CODEC_TYPE_AUDIO, + CODEC_ID_TRUEHD, + sizeof(MLPDecodeContext), + mlp_decode_init, + NULL, + NULL, + read_access_unit, + .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), +}; +#endif /* CONFIG_TRUEHD_DECODER */ |