]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6f1a6a9 ea290d9)
Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 13:00:15 +0000 (14:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 13:05:22 +0000 (14:05 +0100)
commit8823ec4f9e92ed705bc1d6643b013c9fb8d46168
treed36acdcbcb64718be4205edae77205c7bef87ea9tree | snapshot
parent6f1a6a9f6ba0528ac5f77c181b715f9c3fa098e9commit | diff
parentea290d919a52f0f8c7e30d69328bb011ed13f61acommit | diff
Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'

* commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a':
  FATE: add a test for the setpts filter
  FATE: add a test for the hqdn3d filter
  FATE: add a test for the transpose filter
  FATE: add a test for the unsharp filter

Conflicts:
tests/ref/fate/filter-hqdn3d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/filter.mak diff1 | diff2 | blob | history
tests/ref/fate/filter-hqdn3d-ubitux | | blob
tests/ref/fate/filter-setpts | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.