← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_libraries/ADM_libass/ass_cache.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_libass/ass_cache.c
21
21
#include "config.h"
22
22
 
23
23
#include <inttypes.h>
24
 
#ifdef HAVE_UNISTD_H
25
 
// avoid warnings due to different definition of this in freetype headers
26
 
#define WE_DO_HAVE_UNISTD_H
27
 
#undef HAVE_UNISTD_H
28
 
#endif
29
24
#include <ft2build.h>
30
25
#include FT_FREETYPE_H
31
26
#include FT_GLYPH_H
32
 
#ifdef WE_DO_HAVE_UNISTD_H
33
 
#undef HAVE_UNISTD_H
34
 
#define HAVE_UNISTD_H
35
 
#endif
36
27
 
37
28
#include <assert.h>
38
29