diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:45:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:00:04 +0200 |
commit | 191430a28f6aba118471c2704e66b2abd1638b94 (patch) | |
tree | 58665d3e174585ec7ff7ab43f941e260e92e3334 /tests/ref | |
parent | 506ebdac2a32e3fe27afd2ff40268c851fc1a817 (diff) | |
parent | 28663511c99b3cdaf9387a15032259879474f5f4 (diff) | |
download | ffmpeg-191430a28f6aba118471c2704e66b2abd1638b94.tar.gz |
Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'
* commit '28663511c99b3cdaf9387a15032259879474f5f4':
fate: Invoke pixdesc lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
-rw-r--r-- | tests/ref/fate/filter-pixdesc (renamed from tests/ref/lavfi/pixfmts_pixdesctest) | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/ref/lavfi/pixfmts_pixdesctest b/tests/ref/fate/filter-pixdesc index 05d5e0f735..f8473c132b 100644 --- a/tests/ref/lavfi/pixfmts_pixdesctest +++ b/tests/ref/fate/filter-pixdesc @@ -31,7 +31,6 @@ monob 309b5785a36bd988d17e15d88f4ffad1 monow 8809a02bc69b58d1114b09ca79ebffad nv12 75e90c54d858b993e99f4ee6d2a2a38f nv21 8831a3f411015d45fbc5dd191245ba9c -pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 rgb0 5774780b3c532896300fa326fcde01a8 rgb24 c71ba90f69f15c8275232bb3f62d0ced rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 |