Merge branch '0.70-support'

diff --combined ChangeLog
index 56a3804020d3feff31586a05b4ef5a08177f0fee,5973d0c62c62a055dc82003681e4ad134e3610dd..73e7eb85fd038c45e4ab455ef94cf50f6ff5c2d9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,7 +1,7 @@@
+ 2013-01-24  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.72 released.
+ 
  2013-01-24  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.71 released.
@@@ -6,28 -10,6 +10,28 @@@
  
        * 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 b051ced3ab9c952aea52f6c7ba32d36df24bf63c,89c4408e6388c042dd07eb918c50f16810ba45b4..9ee5288bab6887c56b0b186a6e85a815e9c4732d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
+ dvdomatic (0.72-1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Carl Hetherington <carl@houllier.lan>  Thu, 24 Jan 2013 15:31:57 +0000
+ 
  dvdomatic (0.71-1) UNRELEASED; urgency=low
  
    * New upstream release.
@@@ -7,10 -13,8 +13,10 @@@
  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 wscript
index ef962e90f536c8582ab37a3f7b9755286f127e2f,906dff7968677645d5cdee89e16fb21c415b7457..99e7522d114bb1c7dc9ac1e077e86076c4e55273
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dvdomatic'
- VERSION = '0.72pre'
+ VERSION = '0.73pre'
  
  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'):