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

merge 3931 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 3931

  • 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])
Note: See TracChangeset for help on using the changeset viewer.