Hi,
On Tue, 2 Mar 2010, Rob Savoye wrote:
Anyway, I just checked in your patch to this branch as of revno
#11825. For some reason the git patches don't apply 100% correctly, so
although I went through this by hand, I could have missed something. It
does compile and run though.
Attached a patch to fix the merge problem: duplicate decls.
commit e1fca2a8189ea131cde34281ff3dede14219b885
Author: Gwenole Beauchesne <[email protected]>
Date: Tue Mar 2 12:22:14 2010 +0000
Fix SW fallback if VA-API is built-in.
diff --git a/libvaapi/vaapi_utils.h b/libvaapi/vaapi_utils.h
index 604ba77..5da63b7 100644
--- a/libvaapi/vaapi_utils.h
+++ b/libvaapi/vaapi_utils.h
@@ -30,12 +30,6 @@ void DSOEXPORT vaapi_set_is_enabled(bool enabled);
/// Check whether video acceleration is enabled
bool DSOEXPORT vaapi_is_enabled();
-/// Enable video acceleration (with VA API)
-void DSOEXPORT vaapi_set_is_enabled(bool enabled);
-
-/// Check whether video acceleration is enabled
-bool DSOEXPORT vaapi_is_enabled();
-
/// Debug output
void DSOEXPORT vaapi_dprintf(const char *format, ...);
_______________________________________________
Gnash-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-dev
