mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filter: benchmark: merge conflicts on tests.go file

This commit is contained in:
Ella Pietraroia 2020-02-11 10:59:48 +10:30
parent ee3781eddc
commit e73be1e30a
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
filter/tests.go
View File

@ -1,34 +1,14 @@
/*
DESCRIPTION
<<<<<<< HEAD
<<<<<<< HEAD
tests.go contains 15 JPEG frames in hex used for testing in filter_test.go.
These are used to test the benchmarking for the filters found in this
folder, the output of the filters can be found in testout/test_outFILTER.mjpeg
=======
tests.go contains JPEG frames used for testing in jpeg_test.go.
These are used to test the benchmarking for the filters found in this
folder, the output of the filters can be found in testout/test_outFILTER.mjpeg
>>>>>>> 03d46b19... filter: benchmark: chaning descriptions
=======
tests.go contains 15 JPEG frames in hex used for testing in filter_test.go.
These are used to test the benchmarking for the filters found in this
folder, the output of the filters can be found in testout/test_outFILTER.mjpeg
>>>>>>> 3800faf9... filter: benchmark: error checking for write function update descriptions
AUTHOR
Ella Pietraroia <ella@ausocean.org>
LICENSE
<<<<<<< HEAD
<<<<<<< HEAD
Copyright (C) 2020 the Australian Ocean Lab (AusOcean)
=======
Copyright (C) 2019 the Australian Ocean Lab (AusOcean)
>>>>>>> 03d46b19... filter: benchmark: chaning descriptions
=======
Copyright (C) 2020 the Australian Ocean Lab (AusOcean)
>>>>>>> 60437c8c... filter: benchmark: upadte headers, add consts, print to log
It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the