X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fasset.C;h=c7ebcdd2ff939255bcb361cd1a207bf78ba471d7;hb=f9d0d999e813ae19965e07ae2f7da690b4e6fe45;hp=0128f94ee8ff499d4ea3023e7076705ad06f7d0d;hpb=15359610833cd03c44fe47f5d002e643103610ec;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/asset.C b/cinelerra-5.0/cinelerra/asset.C
index 0128f94e..c7ebcdd2 100644
--- a/cinelerra-5.0/cinelerra/asset.C
+++ b/cinelerra-5.0/cinelerra/asset.C
@@ -30,7 +30,6 @@
 #include "filexml.h"
 #include "format.inc"
 #include "indexstate.h"
-#include "quicktime.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -69,7 +68,6 @@ Asset::~Asset()
 int Asset::init_values()
 {
 	path[0] = 0;
-//	format = FILE_MOV;
 // Has to be unknown for file probing to succeed
 	format = FILE_UNKNOWN;
 	fformat[0] = 0;
@@ -81,8 +79,8 @@ int Asset::init_values()
 	reset_audio();
 	reset_video();
 
-	strcpy(vcodec, QUICKTIME_YUV2);
-	strcpy(acodec, QUICKTIME_TWOS);
+	strcpy(vcodec, "");
+	strcpy(acodec, "");
 
 	ff_audio_options[0] = 0;
 	ff_video_options[0] = 0;
@@ -345,31 +343,18 @@ int64_t Asset::get_index_size(int channel)
 
 char* Asset::get_compression_text(int audio, int video)
 {
-	if(audio)
-	{
-		switch(format)
-		{
-			case FILE_MOV:
-			case FILE_AVI:
-				if(acodec[0])
-					return quicktime_acodec_title(acodec);
-				else
-					return 0;
-				break;
+	if(audio) {
+		switch(format) {
+		case FILE_FFMPEG:
+			if( acodec[0] ) return acodec;
+			break;
 		}
 	}
-	else
-	if(video)
-	{
-		switch(format)
-		{
-			case FILE_MOV:
-			case FILE_AVI:
-				if(vcodec[0])
-					return quicktime_vcodec_title(vcodec);
-				else
-					return 0;
-				break;
+	if(video) {
+		switch(format) {
+		case FILE_FFMPEG:
+			if( vcodec[0] ) return vcodec;
+			break;
 		}
 	}
 	return 0;