← Back to branch summary

~ubuntu-branches/ubuntu/saucy/avidemux/saucy

« back to all changes in this revision

Viewing changes to plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel van Vugt
  • Date: 2011-10-17 17:27:32 UTC
  • Revision ID: james.westby@ubuntu.com-20111017172732-16r2iixi916qwatj
Tags: 1:2.5.4-0ubuntu8
https://launchpad.net/bugs/831096
* Fix build failure of 1:2.5.4-0ubuntu7 (LP: #831096) due to:
  - changed structure members in x264.h release 115 and later;
  - missing install rule for i18n files;
  - missing dependency on xsltproc, causing unpredictable failures
    on systems without xsltproc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
417
417
        _param.b_cabac = cabac;
418
418
}
419
419
 
420
 
#if X264_BUILD > 101
 
420
#if X264_BUILD > 101 && X264_BUILD < 115
421
421
unsigned int x264Options::getOpenGopMode(void)
422
422
{
423
423
        return _param.i_open_gop;
428
428
        if (openGopMode < 3)
429
429
                _param.i_open_gop = openGopMode;
430
430
}
 
431
#elif X264_BUILD > 114
 
432
unsigned int x264Options::getOpenGopMode(void)
 
433
{
 
434
        return _param.b_open_gop;
 
435
}
 
436
void x264Options::setOpenGopMode(unsigned int openGopMode)
 
437
{
 
438
        if (openGopMode < 3)
 
439
                _param.b_open_gop = openGopMode;
 
440
}
431
441
#endif
432
442
 
433
443
unsigned int x264Options::getInterlaced(void)