Changeset 4225


Ignore:
Timestamp:
Mar 11, 2014 9:30:39 AM (7 years ago)
Author:
ldelgass
Message:

merge 3931 from trunk

Location:
branches/1.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 3931
  • branches/1.3/configure

    r4206 r4225  
    96009600fi
    96019601
    9602 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
     9602for 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
    96039603do :
    96049604  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  • branches/1.3/configure.in

    r4149 r4225  
    282282fi
    283283
    284 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],,,[
     284AC_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],,,[
    285285#define __STDC_CONSTANT_MACROS 1
    286286])
  • branches/1.3/src/core/config.h.in

    r3717 r4225  
    130130#undef HAVE_LIBAVUTIL_AVUTIL_H
    131131
     132/* Define to 1 if you have the <libavutil/mathematics.h> header file. */
     133#undef HAVE_LIBAVUTIL_MATHEMATICS_H
     134
    132135/* Define to 1 if you have the `ncurses' library (-lncurses). */
    133136#undef HAVE_LIBNCURSES
     
    237240/* Define to the one symbol short name of this package. */
    238241#undef PACKAGE_TARNAME
    239 
    240 /* Define to the home page for this package. */
    241 #undef PACKAGE_URL
    242242
    243243/* Define to the version of this package. */
  • branches/1.3/video/RpVideo.c

    r4224 r4225  
    4343#ifdef HAVE_LIBAVUTIL_AVUTIL_H
    4444# include <libavutil/avutil.h>
     45#endif
     46
     47#ifdef HAVE_LIBAVUTIL_MATHEMATICS_H
     48# include <libavutil/mathematics.h> /* for av_rescale_q and av_gcd */
    4549#endif
    4650
Note: See TracChangeset for help on using the changeset viewer.