[FFmpeg-cvslog] avcodec: Fix libdcadec include dir

Kacper Michajłow git at videolan.org
Fri Mar 20 02:38:26 CET 2015


ffmpeg | branch: master | Kacper Michajłow <kasper93 at gmail.com> | Fri Mar 20 01:58:25 2015 +0100| [4f3c31df3f569c7171ee9e651ddf479690367b9b] | committer: Michael Niedermayer

avcodec: Fix libdcadec include dir

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f3c31df3f569c7171ee9e651ddf479690367b9b
---

 configure              |    2 +-
 libavcodec/libdcadec.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index a449bc7..1ef83e3 100755
--- a/configure
+++ b/configure
@@ -4925,7 +4925,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                              { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 enabled libcaca           && require_pkg_config caca caca.h caca_create_canvas
-enabled libdcadec         && require libdcadec dca_context.h dcadec_context_create -ldcadec
+enabled libdcadec         && require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec
 enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
 flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c
index d060db5..a28b983 100644
--- a/libavcodec/libdcadec.c
+++ b/libavcodec/libdcadec.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <dca_context.h>
+#include <libdcadec/dca_context.h>
 
 #include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"



More information about the ffmpeg-cvslog mailing list