vo_caca: use the pre-1.x compatibility layer so recent

versions of libcaca still work.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19985 b3059339-0415-0410-9bf9-f77b7e298cf2

configure

@@ -4172,6 +4172,9 @@ if test "$_caca" = auto ; then
   if ( caca-config --version ) >> "$TMPLOG" 2>&1 ; then
   cat > $TMPC << EOF
 #include <caca.h>
+#ifdef CACA_API_VERSION_1
+  #include <caca0.h>
+#endif
 int main(void) { (void) caca_init(); return 0; }
 EOF
   cc_check `caca-config --libs` && _caca=yes

libvo/vo_caca.c

@@ -28,6 +28,14 @@
 #include "mp_msg.h"
 
 #include <caca.h>
+#ifdef CACA_API_VERSION_1
+  /* Include the pre-1.x compatibility header.
+   * Once libcaca 1.x is widespread, vo_caca should be fully
+   * converted to the new API. A patch exists:
+   * http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-July/044674.html
+   */
+  #include <caca0.h>
+#endif
 
 static vo_info_t info = {
   "libcaca",