[GEM-cvs] Gem/src/Pixes filmFFMPEG.cpp,1.4,1.5 filmFFMPEG.h,1.3,1.4 pix_filmFFMPEG.h,1.4,1.5

[IOhannes m z. <zmo...@us...>]

Update of /cvsroot/pd-gem/Gem/src/Pixes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25465/Pixes

Modified Files:
	filmFFMPEG.cpp filmFFMPEG.h pix_filmFFMPEG.h 
Log Message:
better detection for FFMPEG (now we also have autodetection; i hope ffmpeg has stabilized the API enough, so this won't break for some months)


Index: pix_filmFFMPEG.h
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Pixes/pix_filmFFMPEG.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pix_filmFFMPEG.h	22 Jul 2003 19:00:36 -0000	1.4
--- pix_filmFFMPEG.h	23 May 2005 11:59:19 -0000	1.5
***************
*** 17,28 ****
  #define INCLUDE_PIX_FILMFFMPEG_H_
  
! #ifdef HAVE_LIBAVCODEC
! #define HAVE_FFMPEG
  
  
  #include "Pixes/pix_film.h"
  extern "C" {
! #include "ffmpeg/avformat.h"
! #include "ffmpeg/avcodec.h"
  }
  /*-----------------------------------------------------------------
--- 17,27 ----
  #define INCLUDE_PIX_FILMFFMPEG_H_
  
! #ifdef HAVE_FFMPEG
  
  
  #include "Pixes/pix_film.h"
  extern "C" {
! #include "avformat.h"
! #include "avcodec.h"
  }
  /*-----------------------------------------------------------------
***************
*** 87,90 ****
  
  };
! #endif // HAVE_LIBAVCODEC
  #endif	// for header file
--- 86,89 ----
  
  };
! #endif // HAVE_FFMPEG
  #endif	// for header file

Index: filmFFMPEG.cpp
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Pixes/filmFFMPEG.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** filmFFMPEG.cpp	3 Nov 2003 12:13:26 -0000	1.4
--- filmFFMPEG.cpp	23 May 2005 11:59:19 -0000	1.5
***************
*** 28,37 ****
    static bool first_time=true;
    if (first_time) {
! #ifdef HAVE_LIBFFMPEG
      post("pix_film:: libffmpeg support");
  #endif
      first_time = false;
    }
! #ifdef HAVE_LIBFFMPEG
    m_Format=NULL;
  #endif
--- 28,37 ----
    static bool first_time=true;
    if (first_time) {
! #ifdef HAVE_FFMPEG
      post("pix_film:: libffmpeg support");
  #endif
      first_time = false;
    }
! #ifdef HAVE_FFMPEG
    m_Format=NULL;
  #endif
***************
*** 46,50 ****
    close();
  }
! #ifdef HAVE_LIBFFMPEG
  void filmFFMPEG :: close(void)
  {
--- 46,50 ----
    close();
  }
! #ifdef HAVE_FFMPEG
  void filmFFMPEG :: close(void)
  {
***************
*** 212,214 ****
    return FILM_ERROR_DONTKNOW;
  }
! #endif
--- 212,214 ----
    return FILM_ERROR_DONTKNOW;
  }
! #endif /* HAVE_FFMPEG */

Index: filmFFMPEG.h
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Pixes/filmFFMPEG.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** filmFFMPEG.h	3 Nov 2003 12:13:26 -0000	1.3
--- filmFFMPEG.h	23 May 2005 11:59:19 -0000	1.4
***************
*** 19,32 ****
  #include "Pixes/film.h"
  
! #if defined(HAVE_LIBAVFORMAT) & defined(HAVE_LIBAVCODEC)
! #define HAVE_LIBFFMPEG
! #else
! #undef HAVE_LIBFFMPEG
! #endif
! 
! #ifdef HAVE_LIBFFMPEG
  extern "C" {
! #include "ffmpeg/avformat.h"
! #include "ffmpeg/avcodec.h"
  }
  #endif
--- 19,26 ----
  #include "Pixes/film.h"
  
! #ifdef HAVE_FFMPEG
  extern "C" {
! #include "avformat.h"
! #include "avcodec.h"
  }
  #endif
***************
*** 56,60 ****
    virtual ~filmFFMPEG();
  
! #ifdef HAVE_LIBFFMPEG
    //////////
    // open a movie up
--- 50,54 ----
    virtual ~filmFFMPEG();
  
! #ifdef HAVE_FFMPEG
    //////////
    // open a movie up