Explorar el Código

made some slight corrections

jp9000 hace 12 años
padre
commit
8421690c33
Se han modificado 2 ficheros con 3 adiciones y 3 borrados
  1. 1 1
      build/data/effects/yuv_to_rgb.effect
  2. 2 2
      libobs/obs.h

+ 1 - 1
build/data/effects/yuv_to_rgb.effect

@@ -21,7 +21,7 @@ VertInOut VSConvert(VertInOut vert_in)
 	return vert_out;
 	return vert_out;
 }
 }
 
 
-float4 PSConvert(VertInOut vert_in)
+float4 PSConvert(VertInOut vert_in) : TARGET
 {
 {
 	float4 yuv = tex.Sample(def_sampler, vert_in.uv);
 	float4 yuv = tex.Sample(def_sampler, vert_in.uv);
 	return saturate(mul(float4(yuv.xyz, 1.0), yuv_matrix));
 	return saturate(mul(float4(yuv.xyz, 1.0), yuv_matrix));

+ 2 - 2
libobs/obs.h

@@ -40,7 +40,7 @@ enum obs_source_type {
 };
 };
 
 
 /* used for changing the order of items (for example, filters in a source,
 /* used for changing the order of items (for example, filters in a source,
- * or items in a scene */
+ * or items in a scene) */
 enum order_movement {
 enum order_movement {
 	ORDER_MOVE_UP,
 	ORDER_MOVE_UP,
 	ORDER_MOVE_DOWN,
 	ORDER_MOVE_DOWN,
@@ -297,7 +297,7 @@ EXPORT void obs_source_obs_async_audio(obs_source_t source,
 /** Gets the current async video frame */
 /** Gets the current async video frame */
 EXPORT struct source_frame *obs_source_getframe(obs_source_t source);
 EXPORT struct source_frame *obs_source_getframe(obs_source_t source);
 
 
-/** Relases the current async frame */
+/** Releases the current async video frame */
 EXPORT void obs_source_releaseframe(obs_source_t source,
 EXPORT void obs_source_releaseframe(obs_source_t source,
 		struct source_frame *frame);
 		struct source_frame *frame);