← Back to branch summary

~ubuntu-branches/ubuntu/utopic/lebiniou/utopic

« back to all changes in this revision

Viewing changes to src/context.c

  • Committer: Package Import Robot
  • Author(s): Logan Rosen
  • Date: 2013-11-13 21:19:20 UTC
  • mfrom: (6.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20131113211920-af65h37psw9fz6oy
Tags: 3.19.1-1ubuntu1
* Merge from Debian unstable. Remaining changes:
  - debian/patches/fix_ftbfs_with_binutils_gold: Add -lz to fix FTBFS with
    binutils-gold.
* debian/patches/fix_ftbfs_with_binutils_gold: Remove -lavutil, as it is
  already linked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/context.c
1
1
/*
2
 
 *  Copyright 1994-2012 Olivier Girondel
 
2
 *  Copyright 1994-2013 Olivier Girondel
3
3
 *
4
4
 *  This file is part of lebiniou.
5
5
 *
176
176
    int res;
177
177
 
178
178
    tmp = g_strdup_printf("%s/%s", data_dir, "/images/zebulon/z-biniou-tv-1.png");
179
 
    printf("[+] Loading '%s'\n", tmp);
 
179
    VERBOSE(printf("[+] Loading '%s'\n", tmp));
180
180
    res = Picture8_load_PNG(ctx->target_pic, tmp);
181
181
    assert(!res);
182
182
    if (res == -1)
186
186
#endif
187
187
 
188
188
#ifdef WITH_WEBCAM
189
 
  printf("[i] Initialiazing %d webcams base: %s\n", webcams, video_base);
 
189
  VERBOSE(printf("[i] Initialazing %d webcams base: %s\n", webcams, video_base));
190
190
 
191
191
  ctx->cam = 0;
192
192
  Context_open_webcam(ctx);