X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffile.C;fp=cinelerra-5.1%2Fcinelerra%2Ffile.C;h=0fb926b26d6601fd4e99018bf4f2f08bf1f19664;hp=2da3eff10aa51fa44a89a3dd030608e0b20b2680;hb=ea0dfe3cd57bb60ef824cd0d3512fcd251020c76;hpb=689228697484138300ce427a680d69f2e44595c3

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index 2da3eff1..0fb926b2 100644
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -1394,10 +1394,9 @@ int64_t File::get_memory_usage()
 }
 
 
-int File::renders_video(Asset *asset)
+int File::renders_video(int format)
 {
-//printf("File::supports_video %d\n", format);
-	switch( asset->format ) {
+	switch( format ) {
 	case FILE_OGG:
 	case FILE_JPEG:
 	case FILE_JPEG_LIST:
@@ -1413,16 +1412,21 @@ int File::renders_video(Asset *asset)
 	case FILE_TIFF_LIST:
 	case FILE_VMPEG:
 	case FILE_RAWDV:
-		return 1;
         case FILE_FFMPEG:
-		return FileFFMPEG::renders_video(asset->fformat);
+		return 1;
 	}
 	return 0;
 }
+int File::renders_video(Asset *asset)
+{
+	return asset->format == FILE_FFMPEG ?
+		FileFFMPEG::renders_video(asset->fformat) :
+		renders_video(asset->format);
+}
 
-int File::renders_audio(Asset *asset)
+int File::renders_audio(int format)
 {
-	switch( asset->format ) {
+	switch( format ) {
 	case FILE_AC3:
 	case FILE_FLAC:
 	case FILE_PCM:
@@ -1434,12 +1438,17 @@ int File::renders_audio(Asset *asset)
 	case FILE_AIFF:
 	case FILE_SND:
 	case FILE_RAWDV:
-		return 1;
         case FILE_FFMPEG:
-		return FileFFMPEG::renders_audio(asset->fformat);
+		return 1;
 	}
 	return 0;
 }
+int File::renders_audio(Asset *asset)
+{
+	return asset->format == FILE_FFMPEG ?
+		FileFFMPEG::renders_audio(asset->fformat) :
+		renders_audio(asset->format);
+}
 
 int File::is_image_render(int format)
 {