X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=c4301af0a30a2c3be033530844d424f2ac05d93d;hb=8568f873b356bbe6b21dd591857e1d03e1739a4e;hp=2828fe31df7a535088d45da3713a084bd22edbd0;hpb=45a8ba3455cf252332c03533a7590df5267ce9aa;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index 2828fe31..c4301af0 100644
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -182,8 +182,8 @@ void Asset::boundaries()
 // 	CLAMP(sample_rate, 1, 1000000);
 // 	CLAMP(frame_rate, 0.001, 1000000);
  	CLAMP(channels, 0, MAX_CHANNELS-1);
- 	CLAMP(width, 0, 32767);
- 	CLAMP(height, 0, 32767);
+ 	CLAMP(width, 0, ASSET_MAX_WIDTH);
+ 	CLAMP(height, 0, ASSET_MAX_HEIGHT);
 //printf("Asset::boundaries %d %d %f\n", __LINE__, sample_rate, frame_rate);
 }
 
@@ -368,11 +368,6 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl)
 			header == asset.header &&
 			dither == asset.dither &&
 			!strcmp(acodec, asset.acodec));
-		if( result && format == FILE_FFMPEG )
-			result = !strcmp(ff_audio_options, asset.ff_audio_options) &&
-				!strcmp(ff_sample_format, asset.ff_sample_format) &&
-				ff_audio_bitrate == asset.ff_audio_bitrate &&
-				ff_audio_quality == asset.ff_audio_quality;
 	}
 
 
@@ -387,13 +382,6 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl)
 			!strcmp(vcodec, asset.vcodec) &&
 			mov_sphere == asset.mov_sphere &&
 			jpeg_sphere == asset.jpeg_sphere);
-		if( result && format == FILE_FFMPEG )
-			result = !strcmp(ff_video_options, asset.ff_video_options) &&
-				!strcmp(ff_pixel_format, asset.ff_pixel_format) &&
-				ff_video_bitrate == asset.ff_video_bitrate &&
-				ff_video_quality == asset.ff_video_quality &&
-				ff_color_space == asset.ff_color_space &&
-				ff_color_range == asset.ff_color_range;
 	}
 
 	return result;
@@ -805,13 +793,6 @@ void Asset::load_defaults(BC_Hash *defaults,
 	vmpeg_preset = GET_DEFAULT("VMPEG_PRESET", vmpeg_preset);
 	vmpeg_field_order = GET_DEFAULT("VMPEG_FIELD_ORDER", vmpeg_field_order);
 
-	theora_fix_bitrate = GET_DEFAULT("THEORA_FIX_BITRATE", theora_fix_bitrate);
-	theora_bitrate = GET_DEFAULT("THEORA_BITRATE", theora_bitrate);
-	theora_quality = GET_DEFAULT("THEORA_QUALITY", theora_quality);
-	theora_sharpness = GET_DEFAULT("THEORA_SHARPNESS", theora_sharpness);
-	theora_keyframe_frequency = GET_DEFAULT("THEORA_KEYFRAME_FREQUENCY", theora_keyframe_frequency);
-	theora_keyframe_force_frequency = GET_DEFAULT("THEORA_FORCE_KEYFRAME_FEQUENCY", theora_keyframe_force_frequency);
-
 
 	ac3_bitrate = GET_DEFAULT("AC3_BITRATE", ac3_bitrate);