← Back to branch summary

~ubuntu-branches/ubuntu/wily/ffmpeg/wily

« back to all changes in this revision

Viewing changes to ffmpeg_vda.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Reinhard Tartler, Andreas Cadhalpun
  • Date: 2015-07-20 10:23:49 UTC
  • mfrom: (27.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20150720102349-prx70m0x0su1xek6
Tags: 7:2.7.2-1
http://bugs.debian.org/780344
[ Reinhard Tartler ]
* Add myself to uploaders.
* Merge qt-faststart back into 'ffmpeg'.

[ Andreas Cadhalpun ]
* Upload to unstable.
* Import new upstream bugfix release 2.7.2.
   - Make -xerror with multi-threading more robust. (Closes: #780344)
* Enable frei0r, opencv, x264, x265 on x32 and x265 on sparc64.
* Disable x264 on sparc64 due to #792921.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg_vda.c
77
77
                  frame->width, frame->height);
78
78
 
79
79
    ret = av_frame_copy_props(vda->tmp_frame, frame);
 
80
    CVPixelBufferUnlockBaseAddress(pixbuf, kCVPixelBufferLock_ReadOnly);
 
81
 
80
82
    if (ret < 0)
81
83
        return ret;
82
84