From dcbd18f44037f097b26aed93fde11392906d86ea Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sat, 23 Apr 2016 21:56:15 +0200
Subject: [PATCH] Make more consistent filenames for QuickSyncEncoder and
 X264Encoder.

---
 Makefile                                      | 2 +-
 mixer.cpp                                     | 2 +-
 mixer.h                                       | 2 +-
 quicksync_encode.cpp => quicksync_encoder.cpp | 4 ++--
 quicksync_encode.h => quicksync_encoder.h     | 0
 x264encode.cpp => x264_encoder.cpp            | 2 +-
 x264encode.h => x264_encoder.h                | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename quicksync_encode.cpp => quicksync_encoder.cpp (99%)
 rename quicksync_encode.h => quicksync_encoder.h (100%)
 rename x264encode.cpp => x264_encoder.cpp (99%)
 rename x264encode.h => x264_encoder.h (100%)

diff --git a/Makefile b/Makefile
index 3220cf8..531362f 100644
--- 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 e1d0e07..efd4952 100644
--- 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 f70fbd6..552aad5 100644
--- 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 109360c..1db37bc 100644
--- 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 25b4423..189da20 100644
--- 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
-- 
2.39.2