Changeset 5301

Timestamp:

May 17, 2016 3:25:51 PM (8 years ago)

Author:

riza

Message:

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.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjmedia/include/pjmedia/config.h (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -6845 +6845 @@
                                 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

pjproject/trunk/aconfigure.ac

@@ -1027 +1027 @@
                                 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
                         

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -1142 +1142 @@
 
 /**
- * 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.
  *