← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/quicktime/apple/quicktime_export.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/quicktime/apple/quicktime_export.c
768
768
        return err;
769
769
}
770
770
 
771
 
static int request_qtcodec_settings(bContext *C, wmOperator *op)
 
771
static int request_qtcodec_settings_exec(bContext *C, wmOperator *op)
772
772
{
773
773
        OSErr err = noErr;
774
774
        Scene *scene = CTX_data_scene(C);
893
893
#if defined(__APPLE__) && defined(GHOST_COCOA)
894
894
/* Need to set up a Cocoa NSAutoReleasePool to avoid memory leak
895
895
 * And it must be done in an objC file, so use a GHOST_SystemCocoa.mm function for that */
896
 
extern int cocoa_request_qtcodec_settings(bContext *C, wmOperator *op);
 
896
extern int cocoa_request_qtcodec_settings_exec(bContext *C, wmOperator *op);
897
897
 
898
898
int fromcocoa_request_qtcodec_settings(bContext *C, wmOperator *op)
899
899
{
900
 
        return request_qtcodec_settings(C, op);
 
900
        return request_qtcodec_settings_exec(C, op);
901
901
}
902
902
#endif
903
903
 
911
911
        
912
912
        /* api callbacks */
913
913
#if defined(__APPLE__) && defined(GHOST_COCOA)
914
 
        ot->exec = cocoa_request_qtcodec_settings;
 
914
        ot->exec = cocoa_request_qtcodec_settings_exec;
915
915
#else
916
 
        ot->exec = request_qtcodec_settings;
 
916
        ot->exec = request_qtcodec_settings_exec;
917
917
#endif
918
918
        ot->poll = ED_operator_setqtcodec;
919
919