Merge pull request #856 from wolfman2000/wolf-ffmpeg-attribute-deprecation

FINALLY shut ffmpeg up!
This commit is contained in:
Jason Felds
2015-10-08 20:10:16 -04:00
2 changed files with 4 additions and 8 deletions
+2 -4
View File
@@ -34,14 +34,12 @@ extern "C" int sm_main( int argc, char *argv[] );
#define ArchSwap16(n) OSSwapInt16((n))
#define HAVE_BYTE_SWAPS
#define attribute_deprecated // Shut ffmpeg up!
#endif
/*
* (c) 2003-2006 Steve Checkoway
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -51,7 +49,7 @@ extern "C" int sm_main( int argc, char *argv[] );
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+2 -4
View File
@@ -22,14 +22,12 @@
#endif
#include "archutils/Common/gcc_byte_swaps.h"
#define attribute_deprecated // Shut ffmpeg up!
#endif
/*
* (c) 2004 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -39,7 +37,7 @@
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF