Move audio into Encoder so that J2KStillEncoder can use it too. Rename J2KWAVEncoder -> J2KVideoEncoder.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/encoder_factory.cc b/src/lib/encoder_factory.cc
index fe4d50ef3..8384ecee3 100644
--- a/src/lib/encoder_factory.cc
+++ b/src/lib/encoder_factory.cc
@@ -22,7 +22,7 @@
  */
 
 #include <boost/filesystem.hpp>
-#include "j2k_wav_encoder.h"
+#include "j2k_video_encoder.h"
 #include "j2k_still_encoder.h"
 #include "film.h"
 
@@ -35,5 +35,5 @@ encoder_factory (shared_ptr<const Film> f, shared_ptr<const EncodeOptions> o)
 		return shared_ptr<Encoder> (new J2KStillEncoder (f, o));
 	}
 	
-	return shared_ptr<Encoder> (new J2KWAVEncoder (f, o));
+	return shared_ptr<Encoder> (new J2KVideoEncoder (f, o));
 }