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

« back to all changes in this revision

Viewing changes to ffmpeg/vhook/fish.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20081226001006-wd8cuqn8d81smkdp
Tags: upstream-1.1.7
ImportĀ upstreamĀ versionĀ 1.1.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
124
124
    *ctxp = av_mallocz(sizeof(ContextInfo));
125
125
    ci = (ContextInfo *) *ctxp;
126
126
 
127
 
    optind = 0;
 
127
    optind = 1;
128
128
 
129
129
    ci->dir = "/tmp";
130
130
    ci->threshold = 100;
354
354
                if (ci->toRGB_convert_ctx == NULL) {
355
355
                    av_log(NULL, AV_LOG_ERROR,
356
356
                           "Cannot initialize the toRGB conversion context\n");
357
 
                    exit(1);
 
357
                    return;
358
358
                }
359
359
                // img_convert parameters are          2 first destination, then 4 source
360
360
                // sws_scale   parameters are context, 4 first source,      then 2 destination