From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Thu, 1 Dec 2011 19:47:12 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.2~42
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=faa3874023a3e05e041756fc3ab49d2b9f9e3d6f;p=casparcg

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1753 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 129d31917..61243c825 100644
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -464,7 +464,7 @@ safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree
 {
 	std::string filename = ptree.get<std::string>("path");
 	auto key_only		 = ptree.get("key-only", false);
-	auto codec			 = ptree.get("codec", "dnxhd");
+	auto codec			 = ptree.get("codec", "libx264");
 	auto options		 = ptree.get("options", "");
 	
 	return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + widen(filename), key_only, codec, options);