← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to src/xtoxwd.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xtoxwd.c
152
152
        XWindowAttributes win_attr = app->win_attr;
153
153
 
154
154
#ifdef DEBUG
155
 
        printf ("Preparing XWD header ... win_attr.x = %i\n", job->win_attr.x);
 
155
        printf ("Preparing XWD header ... win_attr.x = %i\n", app->win_attr.x);
156
156
#endif
157
157
        file_name_len = strlen (file) + 1;
158
158
        head.header_size = (CARD32) (sizeof (head) + file_name_len);
196
196
 
197
197
#ifdef DEBUG
198
198
    printf ("XImageToXWD() header size = %d visual=%d\n",
199
 
            sizeof (XWDFileHeader), job->win_attr.visual->class);
 
199
            sizeof (XWDFileHeader), app->win_attr.visual->class);
200
200
#endif
201
201
}