diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-26 22:54:51 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-26 22:54:51 +0000 |
| commit | 9025bf7cc003e8e9981eaf2adc4c614d9bca765c (patch) | |
| tree | 2788c21b13ec9bfb2fbf2852ae7b4a6c6b764979 /src/libffmpeg/xine_decoder.h | |
| parent | c4fcac1273c5be824b7468edcda160c38dec1692 (diff) | |
| download | xine-lib-9025bf7cc003e8e9981eaf2adc4c614d9bca765c.tar.gz xine-lib-9025bf7cc003e8e9981eaf2adc4c614d9bca765c.tar.bz2 | |
- almost finalize headers refactoring needed for MSVC frontends (and for other
poor platforms, of course)
- fix a bug in generated xine-config for WIN32 and make it relocateable
under Windows
- MSVC port: update, fix some warnings, remove old unneeded files
- improve function for getting runtime directory, it will need next fix
yet (bug probably due to active volume drives)
CVS patchset: 7001
CVS date: 2004/09/26 22:54:51
Diffstat (limited to 'src/libffmpeg/xine_decoder.h')
| -rw-r--r-- | src/libffmpeg/xine_decoder.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/libffmpeg/xine_decoder.h b/src/libffmpeg/xine_decoder.h index 3119a41db..9005b602e 100644 --- a/src/libffmpeg/xine_decoder.h +++ b/src/libffmpeg/xine_decoder.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.h,v 1.3 2004/08/16 15:31:23 mroi Exp $ + * $Id: xine_decoder.h,v 1.4 2004/09/26 22:54:52 valtri Exp $ * */ @@ -28,18 +28,6 @@ #include "config.h" #endif -#ifdef _MSC_VER -/* ffmpeg has own definitions of those types */ -# undef int8_t -# undef uint8_t -# undef int16_t -# undef uint16_t -# undef int32_t -# undef uint32_t -# undef int64_t -# undef uint64_t -#endif - #ifdef HAVE_FFMPEG # include <avcodec.h> #else @@ -50,6 +38,8 @@ # undef malloc # undef free # undef realloc +# undef printf +# undef fprintf #endif typedef struct ff_codec_s { |