[FFmpeg-cvslog] Merge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6'

Derek Buitenhuis git at videolan.org
Mon Apr 11 15:58:53 CEST 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Apr 11 14:58:33 2016 +0100| [8a6cc30b04287adf30ef24a27362fa3d0275f02c] | committer: Derek Buitenhuis

Merge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6'

This commit is a no-op.

* commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6':
  idct: Only build prores IDCT if ProRes decoder is enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a6cc30b04287adf30ef24a27362fa3d0275f02c
---





More information about the ffmpeg-cvslog mailing list