Commit Graph

27 Commits

Author SHA1 Message Date
rdb 8d305273dd Merge remote-tracking branch 'origin/master' into cmake 2016-12-07 23:05:40 +01:00
rdb c410d812ff Remove some settings from dtool_config.h to prevent rebuilds:
- HAVE_OPENCV
 - OPENCV_VER_23
 - HAVE_FFMPEG
 - HAVE_SWSCALE
 - HAVE_SWRESAMPLE
2016-12-05 16:32:13 -05:00
Sam Edwards fffd105f96 Merge branch 'master' into cmake 2016-06-25 19:12:14 -07:00
rdb 18874fa151 Replace PN_int/uint types with stdint.h types, since all compilers we support have them.
Plus, we already had code that relied on them being available anyway.
2016-05-11 00:27:58 +02:00
rdb 881a55f679 Merge branch 'master' into cmake 2016-04-12 21:08:22 +02:00
rdb a9c5525dd6 Compile fix for Ubuntu precise version of ffmpeg 2016-03-25 00:45:12 +01:00
rdb 63dd1e0d2b Fixes for ffmpeg 3.0 2016-03-24 22:24:16 +01:00
Sam Edwards 441371e8d9 Merge branch 'master' into cmake 2016-03-15 18:30:55 -07:00
tobspr 0fcfb8e372 New file headers, new comment style 2016-02-17 17:47:48 +01:00
rdb 5cd4342ed5 Merge branch 'master' into cmake 2016-02-05 17:16:15 +01:00
rdb 090e912ce6 Cleanup of comments and whitespace 2016-02-01 22:30:43 +01:00
rdb 5b291a9b10 Merge branch 'master' into cmake 2015-11-09 19:21:12 +01:00
rdb db3ab953e4 Remove ppremake, genPyCode, and all hacks created to support them 2015-11-09 19:06:49 +01:00
Sam Edwards 25e2e0221d Merge branch 'master' into cmake 2015-03-05 09:46:52 -08:00
Sam Edwards f0b3e08e9c ffmpeg: Use av_frame_* instead of deprecated avcodec_*_frame functions beginning with lavc 55.45.101. 2015-02-24 16:22:37 -08:00
Sam Edwards 894423ace4 ffmpeg: Don't use internal SWR_CH_MAX macro. 2015-02-24 16:06:40 -08:00
rdb a65b477734 Commit patches by cfsworks:
cxx: Fix missing includes masked by composite builds.
misc: Fix typos in comments.
config: Fix missing config forward-declarations.
direct: Adjust Python imports to panda3d.* instead of pandac.*.
display: Split graphicsWindow out into an extension.
framework: Use if/elif/elif/endif instead of ifdef/elif/elif/endif.
ode: Remove erroneous INLINE declarations.
interval: Fix missing import.
2014-10-19 22:41:47 +00:00
Sam Edwards cf1a9f1807 general: Fix up include structure to resolve errors when building without composites. 2014-07-26 15:09:11 -07:00
Sam Edwards 93af05d67a Merge branch 'master' into cmake 2014-04-23 21:14:26 -06:00
rdb 78ed00ef2b fix uninitialised _frame pointer (thanks cfsworks for pointing it out) 2014-04-18 15:22:56 +00:00
rdb caad44773b Commit patch by cfsworks to fix double-free issue with ffmpeg 2014-04-16 13:49:53 +00:00
Sam Edwards 127dfe7c4d cmake: Add FFMPEG compilation support. 2014-04-11 03:38:08 -06:00
rdb 618781e7cc there's no reason to interrogate the ffmpeg code. 2014-01-17 22:09:53 +00:00
rdb 21def6e5cc fix ffmpeg compile issues? 2013-09-16 08:45:57 +00:00
rdb 48baa5c58e ffmpeg compatibility fixes 2013-09-16 07:21:06 +00:00
rdb e0ae9b1bc7 fix error when compiling without libswresample 2013-09-16 07:05:41 +00:00
rdb bca09667a6 Split vrpn out of panda into a libp3vrpn. Split ffmpeg out of movies into libp3ffmpeg. Add registry for MovieVideo and MovieAudio. Add a libvorbisfile-based Ogg Vorbis loader. Add a native .wav loader. 2013-08-26 12:16:27 +00:00