From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Wed, 28 Mar 2012 21:01:19 +0000 (+0000)
Subject: 2.1.0: -ffmpeg_consumer: Fixed param parsing. Fixed REMOVE 1 FILE.
X-Git-Tag: 2.1.0_Beta1~553
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=87efc0f4f27a947aad1a32017b020f9169829a9a;p=casparcg

2.1.0: -ffmpeg_consumer: Fixed param parsing. Fixed REMOVE 1 FILE.


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

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index f2d28bb8b..0bc5093b4 100644
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -149,10 +149,10 @@ struct output_format
 			return set_opt(o.name, o.value);
 		});
 		
-		if(vcodec == CODEC_ID_NONE)
+		if(vcodec == CODEC_ID_NONE && format)
 			vcodec = format->video_codec;
 
-		if(acodec == CODEC_ID_NONE)
+		if(acodec == CODEC_ID_NONE && format)
 			acodec = format->audio_codec;
 		
 		if(vcodec == CODEC_ID_NONE)
@@ -789,7 +789,7 @@ spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wst
 {
 	auto str = std::accumulate(params.begin(), params.end(), std::wstring(), [](const std::wstring& lhs, const std::wstring& rhs) {return lhs + L" " + rhs;});
 	
-	boost::wregex path_exp(L"(FILE)? (?<PATH>.+\\..+).*", boost::regex::icase);
+	boost::wregex path_exp(L"\\s*FILE(\\s(?<PATH>.+\\.[^\\s]+))?.*", boost::regex::icase);
 
 	boost::wsmatch path;
 	if(!boost::regex_match(str, path, path_exp))