← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/util.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/imbuf/intern/util.c
253
253
{
254
254
        if (ELEM(level, AV_LOG_FATAL, AV_LOG_ERROR)) {
255
255
                size_t n;
256
 
                va_list arg2;
257
 
 
258
 
                va_copy(arg2, arg);
259
 
 
260
 
                n = BLI_vsnprintf(ffmpeg_last_error, sizeof(ffmpeg_last_error), format, arg2);
 
256
                va_list args_cpy;
 
257
 
 
258
                va_copy(args_cpy, arg);
 
259
                n = BLI_vsnprintf(ffmpeg_last_error, sizeof(ffmpeg_last_error), format, args_cpy);
 
260
                va_end(args_cpy);
261
261
 
262
262
                /* strip trailing \n */
263
263
                ffmpeg_last_error[n - 1] = '\0';