OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5531 Commits
1 Branch
0 Tags
34 MiB
Tree: 4601fae88c
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '4601fae88c'
${ noResults }
rocklinux/package/stf/mpeg4ip/gcc40.patch

134 lines
6.4 KiB
Raw Normal View History

Clifford Wolf: Happy 2006! New copyright headers.. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6946 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
19 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Stefan Fiedler: mpeg4ip: patch for gcc40 Index: package/stf/mpeg4ip/gcc40.patch =================================================================== [2005102619084816434] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6592 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
19 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/stf/mpeg4ip/gcc40.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  20. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp
  21. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp 2005-05-04 21:55:58.000000000 +0200
  22. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp 2005-10-22 14:41:16.000000000 +0200
  23. @@ -46,8 +46,6 @@
  24. #define _BITSTREAM_HPP_
  25. #include "inbits.h"
  26. #include <iostream>
  27. -class istream;
  28. -class ostream;
  30. class CIOBitStream
  31. {
  32. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp
  33. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp 2005-05-04 21:55:58.000000000 +0200
  34. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp 2005-10-22 14:57:25.000000000 +0200
  35. @@ -43,6 +43,9 @@
  36. /******************************************
  37. *** class CEnhcBufferDecoder ***
  38. ******************************************/
  39. +class CVideoObjectDecoder;
  40. +class CVideoObjectDecoderTPS;
  41. +
  42. class CEnhcBufferDecoder : public CEnhcBuffer
  43. {
  44. friend class CVideoObjectDecoder;
  45. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp
  46. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp 2005-05-04 21:55:58.000000000 +0200
  47. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp 2005-10-22 14:49:30.000000000 +0200
  48. @@ -39,12 +39,16 @@
  49. #ifndef __ENTROPY_HPP_
  50. #define __ENTROPY_HPP_
  52. +#include <istream>
  53. +#include <ostream>
  54. +
  55. +using std::istream;
  56. +using std::ostream;
  58. -class istream;
  59. -class ostream;
  60. class CInBitStream;
  61. class COutBitStream;
  63. +
  64. typedef struct VlcTableTag {
  65. Int lSymbol;
  66. char *pchBits;
  67. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp
  68. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp 2005-05-04 21:55:58.000000000 +0200
  69. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp 2005-10-22 14:41:40.000000000 +0200
  70. @@ -48,8 +48,6 @@
  72. #define VM_HOME_DIR "\\vm"
  74. -class istream;
  75. -class ostream;
  76. class CInBitStream;
  77. class COutBitStream;
  78. class CEntropyEncoder;
  79. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp
  80. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp 2005-05-04 21:55:58.000000000 +0200
  81. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp 2005-10-22 15:00:00.000000000 +0200
  82. @@ -78,6 +78,7 @@
  83. class CEntropyEncoder;
  84. class CEntropyEncoderSet;
  85. class CVideoObjectEncoder;
  86. +class CEnhcBufferEncoder;
  88. typedef struct {
  89. // general info
  90. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp
  91. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp 2005-05-04 21:55:58.000000000 +0200
  92. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp 2005-10-22 14:51:19.000000000 +0200
  93. @@ -66,7 +66,6 @@
  94. #define __VOPSEDEC_HPP_
  96. class CVideoObject;
  97. -class ifstream;
  98. class strstreambuf;
  99. class CInBitStream;
  100. class CEntropyDecoderSet;
  101. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am
  102. --- mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am 2005-05-04 22:25:06.000000000 +0200
  103. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am 2005-10-22 14:25:15.000000000 +0200
  104. @@ -1,5 +1,5 @@
  106. -AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@
  107. +AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@
  109. INCLUDES = -I../include
  111. diff -dur mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in
  112. --- mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in 2005-05-19 00:02:21.000000000 +0200
  113. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in 2005-10-22 14:25:15.000000000 +0200
  114. @@ -355,7 +355,7 @@
  115. target_cpu = @target_cpu@
  116. target_os = @target_os@
  117. target_vendor = @target_vendor@
  118. -AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@
  119. +AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@
  120. INCLUDES = -I../include
  121. lib_LTLIBRARIES = libmpeg4ip_mpeg4_iso.la
  122. mp4vdec_SOURCES = \
  123. diff -dur mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c
  124. --- mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c 2005-01-13 19:21:29.000000000 +0100
  125. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c 2005-10-22 14:17:48.000000000 +0200
  126. @@ -115,7 +115,7 @@
  127. #endif
  129. /* The general mixing thread function */
  130. -static int SDL_RunAudio(void *audiop)
  131. +int SDL_RunAudio(void *audiop)
  132. {
  133. SDL_AudioDevice *audio = (SDL_AudioDevice *)audiop;
  134. Uint8 *stream;