[SCM] libav/experimental: Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit dca7ba4bffe3e4aeb620cb62955256a0d87561f4
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jun 11 05:48:30 2014 -0700

    Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs
    
    The files are only ever compiled if that condition is true.

diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index 71db68c..03b782c 100644
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -33,12 +33,10 @@
 #include "kbdwin.h"
 
 
-#if CONFIG_AC3_ENCODER
 #define AC3ENC_TYPE AC3ENC_TYPE_AC3
 #include "ac3enc_opts_template.c"
 static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name,
                                       ac3_options, LIBAVUTIL_VERSION_INT };
-#endif
 
 #include "ac3enc_template.c"
 
@@ -127,7 +125,6 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl)
 }
 
 
-#if CONFIG_AC3_ENCODER
 AVCodec ff_ac3_encoder = {
     .name            = "ac3",
     .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
@@ -143,4 +140,3 @@ AVCodec ff_ac3_encoder = {
     .channel_layouts = ff_ac3_channel_layouts,
     .defaults        = ac3_defaults,
 };
-#endif
diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c
index c238fc1..18e9f73 100644
--- a/libavcodec/eac3enc.c
+++ b/libavcodec/eac3enc.c
@@ -247,7 +247,6 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s)
 }
 
 
-#if CONFIG_EAC3_ENCODER
 AVCodec ff_eac3_encoder = {
     .name            = "eac3",
     .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"),
@@ -263,4 +262,3 @@ AVCodec ff_eac3_encoder = {
     .channel_layouts = ff_ac3_channel_layouts,
     .defaults        = ac3_defaults,
 };
-#endif
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 2181405..d7d62f1 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -1,5 +1,5 @@
 /*
- * General DV muxer/demuxer
+ * General DV demuxer
  * Copyright (c) 2003 Roman Shaposhnik
  *
  * Many thanks to Dan Dennedy <dan at dennedy.org> for providing wealth
@@ -553,7 +553,6 @@ static int dv_probe(AVProbeData *p)
     return 0;
 }
 
-#if CONFIG_DV_DEMUXER
 AVInputFormat ff_dv_demuxer = {
     .name           = "dv",
     .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@@ -565,4 +564,3 @@ AVInputFormat ff_dv_demuxer = {
     .read_seek      = dv_read_seek,
     .extensions     = "dv,dif",
 };
-#endif

-- 
Libav/FFmpeg packaging