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.

115 lines
5.5 KiB

  1. 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
  2. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp 2005-05-04 21:55:58.000000000 +0200
  3. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/bitstrm.hpp 2005-10-22 14:41:16.000000000 +0200
  4. @@ -46,8 +46,6 @@
  5. #define _BITSTREAM_HPP_
  6. #include "inbits.h"
  7. #include <iostream>
  8. -class istream;
  9. -class ostream;
  10. class CIOBitStream
  11. {
  12. 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
  13. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp 2005-05-04 21:55:58.000000000 +0200
  14. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/enhcbufdec.hpp 2005-10-22 14:57:25.000000000 +0200
  15. @@ -43,6 +43,9 @@
  16. /******************************************
  17. *** class CEnhcBufferDecoder ***
  18. ******************************************/
  19. +class CVideoObjectDecoder;
  20. +class CVideoObjectDecoderTPS;
  21. +
  22. class CEnhcBufferDecoder : public CEnhcBuffer
  23. {
  24. friend class CVideoObjectDecoder;
  25. 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
  26. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp 2005-05-04 21:55:58.000000000 +0200
  27. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/entropy.hpp 2005-10-22 14:49:30.000000000 +0200
  28. @@ -39,12 +39,16 @@
  29. #ifndef __ENTROPY_HPP_
  30. #define __ENTROPY_HPP_
  31. +#include <istream>
  32. +#include <ostream>
  33. +
  34. +using std::istream;
  35. +using std::ostream;
  36. -class istream;
  37. -class ostream;
  38. class CInBitStream;
  39. class COutBitStream;
  40. +
  41. typedef struct VlcTableTag {
  42. Int lSymbol;
  43. char *pchBits;
  44. 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
  45. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp 2005-05-04 21:55:58.000000000 +0200
  46. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/huffman.hpp 2005-10-22 14:41:40.000000000 +0200
  47. @@ -48,8 +48,6 @@
  48. #define VM_HOME_DIR "\\vm"
  49. -class istream;
  50. -class ostream;
  51. class CInBitStream;
  52. class COutBitStream;
  53. class CEntropyEncoder;
  54. 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
  55. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp 2005-05-04 21:55:58.000000000 +0200
  56. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/sesenc.hpp 2005-10-22 15:00:00.000000000 +0200
  57. @@ -78,6 +78,7 @@
  58. class CEntropyEncoder;
  59. class CEntropyEncoderSet;
  60. class CVideoObjectEncoder;
  61. +class CEnhcBufferEncoder;
  62. typedef struct {
  63. // general info
  64. 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
  65. --- mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp 2005-05-04 21:55:58.000000000 +0200
  66. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/include/vopsedec.hpp 2005-10-22 14:51:19.000000000 +0200
  67. @@ -66,7 +66,6 @@
  68. #define __VOPSEDEC_HPP_
  69. class CVideoObject;
  70. -class ifstream;
  71. class strstreambuf;
  72. class CInBitStream;
  73. class CEntropyDecoderSet;
  74. 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
  75. --- mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am 2005-05-04 22:25:06.000000000 +0200
  76. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.am 2005-10-22 14:25:15.000000000 +0200
  77. @@ -1,5 +1,5 @@
  78. -AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@
  79. +AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@
  80. INCLUDES = -I../include
  81. 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
  82. --- mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in 2005-05-19 00:02:21.000000000 +0200
  83. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/common/video/iso-mpeg4/src/Makefile.in 2005-10-22 14:25:15.000000000 +0200
  84. @@ -355,7 +355,7 @@
  85. target_cpu = @target_cpu@
  86. target_os = @target_os@
  87. target_vendor = @target_vendor@
  88. -AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@
  89. +AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@
  90. INCLUDES = -I../include
  91. lib_LTLIBRARIES = libmpeg4ip_mpeg4_iso.la
  92. mp4vdec_SOURCES = \
  93. 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
  94. --- mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c 2005-01-13 19:21:29.000000000 +0100
  95. +++ src.mpeg4ip.1129937794.4189.1371634527/mpeg4ip-1.3/lib/SDLAudio/src/audio/SDL_audio.c 2005-10-22 14:17:48.000000000 +0200
  96. @@ -115,7 +115,7 @@
  97. #endif
  98. /* The general mixing thread function */
  99. -static int SDL_RunAudio(void *audiop)
  100. +int SDL_RunAudio(void *audiop)
  101. {
  102. SDL_AudioDevice *audio = (SDL_AudioDevice *)audiop;
  103. Uint8 *stream;