aboutsummaryrefslogtreecommitdiffstats
path: root/libpostproc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-25 10:46:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-25 10:46:52 +0200
commitbad8f04b0454441edb0b7a1565e28c0b1a07f7ed (patch)
tree5e3f653b0967565e4d9d6eec45b34f302f642c4d /libpostproc
parentcea8a0077fc597a11838f2f7242c01722d577b44 (diff)
parentb0ce601c160c87349d093d7e542b5c752754f598 (diff)
downloadffmpeg-bad8f04b0454441edb0b7a1565e28c0b1a07f7ed.tar.gz
Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'
* commit 'b0ce601c160c87349d093d7e542b5c752754f598': doc/platform: Add info about ICL Conflicts: doc/platform.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions