Start pulling video orchestration logic into VideoEncoder.

[nageru] / Makefile

diff --git a/Makefile b/Makefile
index 531362f98cad13c7120da35ce91966ed104d1485..71a110c1a8fcb2934292d53fee3a2f8ddb8faf4a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,10 @@ OBJS=glwidget.o main.o mainwindow.o vumeter.o lrameter.o vu_common.o correlation
 OBJS += glwidget.moc.o mainwindow.moc.o vumeter.moc.o lrameter.moc.o correlation_meter.moc.o aboutdialog.moc.o
 
 # Mixer objects
-OBJS += quicksync_encoder.o x264_encoder.o mixer.o bmusb/bmusb.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampling_queue.o metacube2.o httpd.o mux.o ebu_r128_proc.o flags.o image_input.o stereocompressor.o filter.o alsa_output.o correlation_measurer.o
+OBJS += mixer.o bmusb/bmusb.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampling_queue.o httpd.o ebu_r128_proc.o flags.o image_input.o stereocompressor.o filter.o alsa_output.o correlation_measurer.o
+
+# Streaming and encoding objects
+OBJS += quicksync_encoder.o x264_encoder.o video_encoder.o metacube2.o mux.o
 
 # DeckLink
 OBJS += decklink_capture.o decklink/DeckLinkAPIDispatch.o