Make more consistent filenames for QuickSyncEncoder and X264Encoder.

diff --git a/Makefile b/Makefile
index 3220cf8bedfca04fd2de8468d136c58634af2a8d..531362f98cad13c7120da35ce91966ed104d1485 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ 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_encode.o x264encode.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 += 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
 
 # DeckLink
 OBJS += decklink_capture.o decklink/DeckLinkAPIDispatch.o

diff --git a/mixer.cpp b/mixer.cpp
index e1d0e07ad6e31d4720461e072fcd58c5714cd133..efd4952b7e565f379128673e11f2a7089d46c644 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -33,7 +33,7 @@
 #include "decklink_capture.h"
 #include "defs.h"
 #include "flags.h"
-#include "quicksync_encode.h"
+#include "quicksync_encoder.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
 #include "timebase.h"

diff --git a/mixer.h b/mixer.h
index f70fbd68c13a85ba91edfd6b1db0e22c48c3d3e6..552aad533471458ee60b8ef40552a477172eb3ea 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -24,7 +24,7 @@
 #include "bmusb/bmusb.h"
 #include "alsa_output.h"
 #include "ebu_r128_proc.h"
-#include "quicksync_encode.h"
+#include "quicksync_encoder.h"
 #include "httpd.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"

diff --git a/quicksync_encode.cpp b/quicksync_encoder.cpp
similarity index 99%
rename from quicksync_encode.cpp
rename to quicksync_encoder.cpp
index 109360cd48850631e80da672136b6edf93c18dff..1db37bc8d1654ff97b6b672720de4128989597eb 100644 (file)
--- a/quicksync_encode.cpp
+++ b/quicksync_encoder.cpp
@@ -1,5 +1,5 @@
 //#include "sysdeps.h"
-#include "quicksync_encode.h"
+#include "quicksync_encoder.h"
 
 #include <movit/util.h>
 #include <EGL/eglplatform.h>
@@ -44,7 +44,7 @@ extern "C" {
 #include "httpd.h"
 #include "mux.h"
 #include "timebase.h"
-#include "x264encode.h"
+#include "x264_encoder.h"
 
 using namespace std;
 

diff --git a/quicksync_encode.h b/quicksync_encoder.h
similarity index 100%
rename from quicksync_encode.h
rename to quicksync_encoder.h

diff --git a/x264encode.cpp b/x264_encoder.cpp
similarity index 99%
rename from x264encode.cpp
rename to x264_encoder.cpp
index 25b442367cfacc56fac1a9ca40adaa9d43536f75..189da20ad7f0c64f0fff92b044b324a957cf44e5 100644 (file)
--- a/x264encode.cpp
+++ b/x264_encoder.cpp
@@ -5,7 +5,7 @@
 #include "flags.h"
 #include "mux.h"
 #include "timebase.h"
-#include "x264encode.h"
+#include "x264_encoder.h"
 
 extern "C" {
 #include <libavformat/avformat.h>

diff --git a/x264encode.h b/x264_encoder.h
similarity index 100%
rename from x264encode.h
rename to x264_encoder.h