Changeset 4225

Timestamp:

Mar 11, 2014, 9:30:39 AM (11 years ago)

Author:

ldelgass

Message:

merge 3931 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• src/core/config.h.in (modified) (2 diffs)
• video/RpVideo.c (modified) (1 diff)

branches/1.3/configure

@@ -9600 +9600 @@
 fi
 
-for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h ffmpeg/swscale.h libswscale/swscale.h
+for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h libavutil/mathematics.h ffmpeg/swscale.h libswscale/swscale.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

branches/1.3/configure.in

@@ -282 +282 @@
 fi
 
-AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h ffmpeg/swscale.h libswscale/swscale.h],,,[
+AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h libavutil/mathematics.h ffmpeg/swscale.h libswscale/swscale.h],,,[
 #define __STDC_CONSTANT_MACROS 1
 ])

branches/1.3/src/core/config.h.in

@@ -130 +130 @@
 #undef HAVE_LIBAVUTIL_AVUTIL_H
 
+/* Define to 1 if you have the <libavutil/mathematics.h> header file. */
+#undef HAVE_LIBAVUTIL_MATHEMATICS_H
+
 /* Define to 1 if you have the `ncurses' library (-lncurses). */
 #undef HAVE_LIBNCURSES
@@ -237 +240 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
 
 /* Define to the version of this package. */

branches/1.3/video/RpVideo.c

@@ -43 +43 @@
 #ifdef HAVE_LIBAVUTIL_AVUTIL_H
 # include <libavutil/avutil.h>
+#endif
+
+#ifdef HAVE_LIBAVUTIL_MATHEMATICS_H
+# include <libavutil/mathematics.h> /* for av_rescale_q and av_gcd */
 #endif