Remove the checks for AVPacket definitions in libavformat.

It has been moved to libavcodec in 2009, libavcodec version 52, and xbmc requires ffmpeg 1.0, libavcodec version 54, so we can assume AVPacket is always defined in libavcodec.
praveenkannan · May 17, 2013 · d7c50d9 · d7c50d9
1 parent 533991d
commit d7c50d9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/configure.in b/configure.in
@@ -1614,13 +1614,6 @@ if test "$use_external_ffmpeg" = "yes"; then
                     [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"],
                     AC_MSG_ERROR($missing_library))
 
-  # Determine whether AVPacket and relevant functions are defined in libavformat
-  # or libavcodec
-  AC_CHECK_LIB([avcodec], [av_free_packet],
-  [AC_MSG_NOTICE(== AVPacket and relevant functions defined in libavcodec. ==)],
-  [AC_MSG_NOTICE(== AVPacket and relevant functions defined in libavformat. ==)
-   AC_DEFINE([AVPACKET_IN_AVFORMAT], [1], [Whether AVPacket is in libavformat.])])
-
   # in case the headers are in a custom directory
   SAVE_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"

diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
@@ -48,15 +48,9 @@ extern "C" {
     #if (defined HAVE_LIBAVCODEC_OPT_H)
       #include <libavcodec/opt.h>
     #endif
-    #if (defined AVPACKET_IN_AVFORMAT)
-      #include <libavformat/avformat.h>
-    #endif
   #elif (defined HAVE_FFMPEG_AVCODEC_H)
     #include <ffmpeg/avcodec.h>
     #include <ffmpeg/opt.h>
-    #if (defined AVPACKET_IN_AVFORMAT)
-      #include <ffmpeg/avformat.h>
-    #endif
   #endif
 #else
   #include "libavcodec/avcodec.h"