← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/ADM_libraries/ADM_lavcodec/h263.c

  • Committer: Bazaar Package Importer
  • Author(s): Matvey Kozhev
  • Date: 2008-01-23 14:24:55 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080123142455-wznqmv3teznzpmjb
Tags: 1:2.4.0-0.3ubuntu1
https://launchpad.net/bugs/178845
https://launchpad.net/bugs/180393
https://launchpad.net/bugs/177082
https://launchpad.net/bugs/181389
* Merged new upstream release from debian-multimedia.org
  (LP: #178845, LP: #180393), remaining Ubuntu changes:
  + debian/control:
    - set maintainer fields per Ubuntu policy.
    - removed libamrnb-dev, not in Ubuntu and most likely
      will never be (due to being proprietary software).
    - build against current libx264-dev (LP: #177082).
    - build against current libfaac-dev (LP: #181389).
    - build-depend on chrpath to strip rpath from avidemux2_qt4.
  + debian/rules: strip rpath from avidemux2_qt4.
  + debian/source.lintian-overrides: re-added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_libraries/ADM_lavcodec/h263.c
3123
3123
    int v= show_bits(&s->gb, 16);
3124
3124
 
3125
3125
    // MEANX if( s->workaround_bugs&FF_BUG_NO_PADDING){
3126
 
    if(s->lavc_build==4655) // Breaks multithreaded decoding meanx
 
3126
    if(s->lavc_build==4655 || s->xvid_build ) // Breaks multithreaded decoding meanx
3127
3127
    {
3128
3128
    #if 0
3129
3129
    #undef printf