From: Carl Hetherington <cth@carlh.net>
Date: Thu, 24 Jan 2013 15:16:30 +0000 (+0000)
Subject: Merge in 0.70 branch with 0.71 fix.
X-Git-Tag: v2.0.48~1337^2~705^2~12
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=71ea64782f215c605877f5c231a2a8b1838fe8bd;hp=-c;p=dcpomatic.git

Merge in 0.70 branch with 0.71 fix.
---

71ea64782f215c605877f5c231a2a8b1838fe8bd
diff --combined ChangeLog
index 36bda83b4,4d1fe3423..56a380402
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,11 +1,33 @@@
+ 2013-01-24  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 0.71 released.
+ 
+ 2013-01-24  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix lack of audio with trimmed DCPs.
+ 
 +2013-01-23  Carl Hetherington  <cth@carlh.net>
 +
 +	* Remove multi-reel support (for now); needs more thinking about
 +	and testing.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 0.71beta2 released.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 0.71beta1 released.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +	* Untested support for splitting DCPs
 +	into multiple reels.
 +
 +2013-01-09  Carl Hetherington  <cth@carlh.net>
 +
 +	* Try to build with 0.10.4-ish ffmpeg.
 +
  2013-01-07  Carl Hetherington  <cth@carlh.net>
  
  	* Version 0.70 released.
diff --combined debian/changelog
index b8385a4b0,7bace15d1..b051ced3a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,16 @@@
- dvdomatic (0.71beta2-1) UNRELEASED; urgency=low
+ dvdomatic (0.71-1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Carl Hetherington <carl@houllier.lan>  Thu, 24 Jan 2013 11:36:04 +0000
+ 
+ dvdomatic (0.70-1) UNRELEASED; urgency=low
  
    * New upstream release.
 +  * New upstream release.
 +  * New upstream release.
  
 - -- Carl Hetherington <carl@houllier.lan>  Mon, 07 Jan 2013 23:57:26 +0000
 + -- Carl Hetherington <cth@carlh.net>  Sat, 12 Jan 2013 23:07:15 +0000
  
  dvdomatic (0.70beta3-1) UNRELEASED; urgency=low
  
diff --combined src/lib/encoder.cc
index efedfcfef,f396e3cf2..910d7c58e
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@@ -325,7 -325,7 +325,7 @@@ Encoder::process_video (shared_ptr<Imag
  					  new DCPVideoFrame (
  						  image, sub, _opt->out_size, _opt->padding, _film->subtitle_offset(), _film->subtitle_scale(),
  						  _film->scaler(), _video_frame, _film->frames_per_second(), s.second,
 -						  Config::instance()->colour_lut_index (), Config::instance()->j2k_bandwidth (),
 +						  _film->colour_lut(), _film->j2k_bandwidth(),
  						  _film->log()
  						  )
  					  ));
@@@ -350,6 -350,7 +350,7 @@@ Encoder::process_audio (shared_ptr<Audi
  
  		if (this_range.second < required_range.first || required_range.second < this_range.first) {
  			/* No part of this audio is within the required range */
+ 			_audio_frame += data->frames();
  			return;
  		} else if (required_range.first >= this_range.first && required_range.first < this_range.second) {
  			/* Trim start */
diff --combined wscript
index d8ec37667,ea571fba6..ef962e90f
--- a/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dvdomatic'
- VERSION = '0.71beta2'
+ VERSION = '0.72pre'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -50,7 -50,7 +50,7 @@@ def configure(conf)
          conf.env.append_value('CXXFLAGS', '-O2')
  
      if not conf.options.static:
 -        conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
 +        conf.check_cfg(package = 'libdcp', atleast_version = '0.36', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
          conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
          conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
          conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
@@@ -103,7 -103,7 +103,7 @@@
      if conf.options.static:
          conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
      else:
 -        conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
 +        conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', uselib_store = 'OPENJPEG', mandatory = True)
  
      conf.check_cc(fragment  = """
                                #include <libssh/libssh.h>\n
@@@ -151,36 -151,6 +151,36 @@@
                               define_name = 'HAVE_G_FORMAT_SIZE',
                               mandatory = False)
  
 +    conf.check_cc(fragment = """
 +                             extern "C" {
 +                               #include <libavutil/avutil.h>
 +                             }
 +                             int main() { AVPixelFormat f; }
 +                             """, msg = 'Checking for AVPixelFormat',
 +                             uselib = 'AVUTIL',
 +                             define_name = 'HAVE_AV_PIXEL_FORMAT',
 +                             mandatory = False)
 +
 +    conf.check_cc(fragment = """
 +                             extern "C" {
 +                               #include <libavcodec/avcodec.h>
 +                             }
 +                             int main() { AVFrame* f; av_frame_get_best_effort_timestamp(f); }
 +                             """, msg = 'Checking for av_frame_get_best_effort_timestamp',
 +                             uselib = 'AVCODEC',
 +                             define_name = 'HAVE_AV_FRAME_GET_BEST_EFFORT_TIMESTAMP',
 +                             mandatory = False)
 +
 +    conf.check_cc(fragment = """
 +                             extern "C" {
 +                               #include <libavfilter/buffersrc.h>
 +                             }
 +                             int main() { } 
 +                             """, msg = 'Checking for buffersrc.h',
 +                             uselib = 'AVCODEC',
 +                             define_name = 'HAVE_BUFFERSRC_H',
 +                             mandatory = False)
 +
      conf.recurse('src')
      conf.recurse('test')
  
@@@ -206,7 -176,7 +206,7 @@@ def build(bld)
      bld.add_post_fun(post)
  
  def dist(ctx):
 -    ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html'
 +    ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html'
  
  def create_version_cc(version):
      if os.path.exists('.git'):