From c6825f48549018d7dec4f15705fbd92fd34ceed6 Mon Sep 17 00:00:00 2001 From: Riza Sulistyo Date: Tue, 17 May 2016 15:25:51 +0000 Subject: Re #1920: In the development branch of FFmpeg 0.8 (in July 2010), a new library was created AVCore. Just a half year later (February 2011), AVCore was merged into AVUtil (52.38.0). Furthermore, nothing in pjproject uses libavcore. Therefore, it is save to remove all references to that library. Thanks to Alexander Traud for the patch. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5301 74dad513-b988-da41-8d7b-12977e46ad98 --- aconfigure | 4 ---- aconfigure.ac | 4 ---- pjmedia/include/pjmedia/config.h | 9 --------- 3 files changed, 17 deletions(-) diff --git a/aconfigure b/aconfigure index fcbee469..b6117574 100755 --- a/aconfigure +++ b/aconfigure @@ -6844,10 +6844,6 @@ $as_echo_n "checking ffmpeg packages... " >&6; } ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" av_pkg="$av_pkg libavutil" fi - if $PKG_CONFIG --exists libavcore; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1" - av_pkg="$av_pkg libavcore" - fi if test "x$av_pkg" == "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: none detected (check the prefix)! **" >&5 diff --git a/aconfigure.ac b/aconfigure.ac index 768411ec..5682e14e 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -1027,10 +1027,6 @@ AC_ARG_ENABLE(ffmpeg, ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" av_pkg="$av_pkg libavutil" fi - if $PKG_CONFIG --exists libavcore; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1" - av_pkg="$av_pkg libavcore" - fi if test "x$av_pkg" == "x"; then AC_MSG_RESULT([none detected (check the prefix)! **]) diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h index 0dfd20ea..817fba89 100644 --- a/pjmedia/include/pjmedia/config.h +++ b/pjmedia/include/pjmedia/config.h @@ -1140,15 +1140,6 @@ # define PJMEDIA_HAS_LIBAVDEVICE PJMEDIA_HAS_FFMPEG #endif -/** - * Specify if FFMPEG libavcore is available. - * - * Default: PJMEDIA_HAS_FFMPEG (or detected by configure) - */ -#ifndef PJMEDIA_HAS_LIBAVCORE -# define PJMEDIA_HAS_LIBAVCORE PJMEDIA_HAS_FFMPEG -#endif - /** * Maximum video planes. * -- cgit v1.2.3