diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-14 14:24:34 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-14 14:24:34 +0200 |
commit | 0ff825e0e6fe5fc7238e3964d24779a07cb53518 (patch) | |
tree | 7b47a9fe58a09e12ed99fdfacc84fff198ce5ce1 /src/decoder.cc | |
parent | 29ae5ac36d4ffc520232ff393b2455130ec0227e (diff) |
Split miav server and client apart. Port client to Qt4. Replace libraw1994 with libiec61883. Add unit tests for multiplexer and fix some bugs in it.
Diffstat (limited to 'src/decoder.cc')
-rw-r--r-- | src/decoder.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/decoder.cc b/src/decoder.cc index 0d56aca..ac039f9 100644 --- a/src/decoder.cc +++ b/src/decoder.cc @@ -32,12 +32,7 @@ * along with MIaV; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <config.h> -#ifdef USE_GUI - -#include "frame_stream.h" - -#include "miav_config.h" +#include "decoder.h" #include <time.h> @@ -47,11 +42,13 @@ #include <SDL/SDL.h> +#include "frame_stream.h" +#include "miav_config.h" + #include "dv.h" #include "dvfile.h" #include "dv1394.h" -#include "decoder.h" #include "debug.h" Decoder::Decoder(Info *ginfo, @@ -282,5 +279,3 @@ void Decoder::setMute(bool m) { mute = m; } - -#endif /*USE_GUI*/ |