]> git.sesse.net Git - ffmpeg/commit
Merge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:58:33 +0000 (14:58 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:58:39 +0000 (14:58 +0100)
commit8a6cc30b04287adf30ef24a27362fa3d0275f02c
treeb076672c80fd4c9c178a7619914322392e854cd2
parentd30cf57a7b2097b565db02ecfffbdc9c16423d0e
parentd6e49096c0c3c10ffb176761b0da150c93bedbf6
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@gmail.com>