← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gnome_options.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_options.h
20
20
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21
21
 */
22
22
 
23
 
#ifndef __GNOME_OPTIONS_H__
24
 
#define __GNOME_OPTIONS_H__
 
23
#ifndef _xvc_GNOME_OPTIONS_H__
 
24
#define _xvc_GNOME_OPTIONS_H__
25
25
 
26
26
#ifndef DOXYGEN_SHOULD_SKIP_THIS
27
27
#include <gtk/gtk.h>
32
32
void xvc_pref_do_OK ();
33
33
void xvc_pref_reset_OK_attempts ();
34
34
 
35
 
#endif     // __GNOME_OPTIONS_H__
 
35
#endif     // _xvc_GNOME_OPTIONS_H__