← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gnome_frame.h

  • 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/gnome_frame.h
21
21
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22
22
 */
23
23
 
24
 
#ifndef __XVC_GNOME_FRAME_H__
25
 
#define __XVC_GNOME_FRAME_H__
 
24
#ifndef _xvc_XVC_GNOME_FRAME_H__
 
25
#define _xvc_XVC_GNOME_FRAME_H__
26
26
 
27
27
#define FRAME_WIDTH 3
28
 
#define FRAME_OFFSET (4*FRAME_WIDTH)
 
28
#define FRAME_OFFSET FRAME_WIDTH
29
29
#define FRAME_EDGE_SIZE 30
30
30
 
31
31
#ifndef DOXYGEN_SHOULD_SKIP_THIS
37
37
void xvc_create_gtk_frame (GtkWidget * w, int width, int height, int x, int y);
38
38
void xvc_destroy_gtk_frame (void);
39
39
 
40
 
#endif     // __XVC_GNOME_FRAME_H__
 
40
#endif     // _xvc_XVC_GNOME_FRAME_H__