[SCM] libav/experimental: Remove pointless CONFIG_MLP_DECODER preprocessor check. The file is only ever compiled if the MLP decoder is enabled.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:56:33 UTC 2013


The following commit has been merged in the experimental branch:
commit 547fc46ca7f9675cebe3a4388d87eb74ce3f091d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Dec 29 17:20:19 2009 +0000

    Remove pointless CONFIG_MLP_DECODER preprocessor check.
    The file is only ever compiled if the MLP decoder is enabled.
    
    Originally committed as revision 20968 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index d211ebd..8060ebe 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -1134,7 +1134,6 @@ error:
     return -1;
 }
 
-#if CONFIG_MLP_DECODER
 AVCodec mlp_decoder = {
     "mlp",
     CODEC_TYPE_AUDIO,
@@ -1146,7 +1145,6 @@ AVCodec mlp_decoder = {
     read_access_unit,
     .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"),
 };
-#endif /* CONFIG_MLP_DECODER */
 
 #if CONFIG_TRUEHD_DECODER
 AVCodec truehd_decoder = {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list