Merge pull request #93 from cchampet/fix_existing_profiles

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit e325ae9a954d · 2014-09-17T01:25:20.000-07:00
Fix existing profiles
diff --git a/src/AvTranscoder/Profiles/Avi.hpp b/src/AvTranscoder/Profiles/Avi.hpp
@@ -11,7 +11,7 @@ void loadAvi( Profile::ProfilesDesc& profiles )
 	avi[ Profile::avProfileIdentificatorHuman ] = "AVI (Audio Video Interleaved)";
 	avi[ Profile::avProfileType ] = Profile::avProfileTypeFormat;
 
-	avi[ "format" ] = "avi";
+	avi[ Profile::avProfileFormat ] = "avi";
 
 	profiles.push_back( avi );
 }
diff --git a/src/AvTranscoder/Profiles/Mkv.hpp b/src/AvTranscoder/Profiles/Mkv.hpp
@@ -11,7 +11,7 @@ void loadMkv( Profile::ProfilesDesc& profiles )
 	mkv[ Profile::avProfileIdentificatorHuman ] = "Matroska";
 	mkv[ Profile::avProfileType ] = Profile::avProfileTypeFormat;
 
-	mkv[ "format" ] = "mastroka";
+	mkv[ Profile::avProfileFormat ] = "matroska";
 
 	profiles.push_back( mkv );
 }
diff --git a/src/AvTranscoder/Profiles/XdCamHd422.hpp b/src/AvTranscoder/Profiles/XdCamHd422.hpp
@@ -70,9 +70,8 @@ void loadXdCamHD422( Profile::ProfilesDesc& profiles )
 	xdCamHd422[ "b_qfactor" ] = "1.25";
 	xdCamHd422[ "i_qoffset" ] = "0";
 	xdCamHd422[ "i_qfactor" ] = "-0.8";
-	xdCamHd422[ "flags" ] = "-cgop"; // open GOP
 
-	xdCamHd422[ "flags" ] = "+ilme+ildct";  // use interlaced motion estimation + use interlaced DCT
+	xdCamHd422[ "flags" ] = "-cgop+ilme+ildct";  // open GOP + use interlaced motion estimation + use interlaced DCT
 
 	xdCamHd422[ "field_order" ] = "tt";
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ void loadAvi( Profile::ProfilesDesc& profiles )`
`11`	`11`	`avi[ Profile::avProfileIdentificatorHuman ] = "AVI (Audio Video Interleaved)";`
`12`	`12`	`avi[ Profile::avProfileType ] = Profile::avProfileTypeFormat;`
`13`	`13`
`14`		`- avi[ "format" ] = "avi";`
	`14`	`+ avi[ Profile::avProfileFormat ] = "avi";`
`15`	`15`
`16`	`16`	`profiles.push_back( avi );`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ void loadMkv( Profile::ProfilesDesc& profiles )`
`11`	`11`	`mkv[ Profile::avProfileIdentificatorHuman ] = "Matroska";`
`12`	`12`	`mkv[ Profile::avProfileType ] = Profile::avProfileTypeFormat;`
`13`	`13`
`14`		`- mkv[ "format" ] = "mastroka";`
	`14`	`+ mkv[ Profile::avProfileFormat ] = "matroska";`
`15`	`15`
`16`	`16`	`profiles.push_back( mkv );`
`17`	`17`	`}`