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.

86 lines
1.9 KiB

  1. diff -pruN mpgtx-1.3/mpeg.cxx mpgtx-1.3_new/mpeg.cxx
  2. --- mpgtx-1.3/mpeg.cxx 2002-08-30 18:03:12.000000000 +0200
  3. +++ mpgtx-1.3_new/mpeg.cxx 2005-01-12 17:01:47.085003784 +0100
  4. @@ -1537,7 +1537,7 @@ void mpeg::SecsToHMS(char* HMS, float du
  5. // find next 0x 00 00 01 xx sequence, returns offset or -1 on err
  6. #ifndef _WIN32
  7. #ifndef _MACOSX
  8. -inline
  9. +//inline
  10. #endif
  11. #endif
  12. @@ -1568,7 +1568,7 @@ off_t mpeg::FindNextMarker(off_t from){
  13. // change mark to xx
  14. #ifndef _WIN32
  15. #ifndef _MACOSX
  16. -inline
  17. +//inline
  18. #endif
  19. #endif
  20. @@ -1596,7 +1596,7 @@ off_t mpeg::FindNextMarker(off_t from, m
  21. // find next 0X00 00 01 mark
  22. #ifndef _WIN32
  23. #ifndef _MACOSX
  24. -inline
  25. +//inline
  26. #endif
  27. #endif
  28. @@ -1631,7 +1631,7 @@ off_t mpeg::FindNextMarker(off_t from, m
  29. // same as above but optimized for backward search
  30. #ifndef _WIN32
  31. #ifndef _MACOSX
  32. -inline
  33. +//inline
  34. #endif
  35. #endif
  36. @@ -1656,7 +1656,7 @@ off_t mpeg::bdFindNextMarker(off_t from,
  37. #ifndef _WIN32
  38. #ifndef _MACOSX
  39. -inline
  40. +//inline
  41. #endif
  42. #endif
  43. @@ -2619,7 +2619,7 @@ transport::transport()
  44. PMT_PIDs(0),
  45. n_PMT_PIDs(0),
  46. read_pmts(0)
  47. -{};
  48. +{}
  49. transport::~transport() {
  50. BTRACK;
  51. @@ -2791,4 +2791,4 @@ while (p != -1)
  52. }
  53. -}
  54. \ No newline at end of file
  55. +}
  56. diff -pruN mpgtx-1.3/mpeg.hh mpgtx-1.3_new/mpeg.hh
  57. --- mpgtx-1.3/mpeg.hh 2002-08-30 18:03:12.000000000 +0200
  58. +++ mpgtx-1.3_new/mpeg.hh 2005-01-12 16:59:17.195790408 +0100
  59. @@ -113,6 +113,7 @@ class transport
  60. class mpeg
  61. {
  62. friend class mpegSystemOut;
  63. + friend class mpegVideoOut;
  64. friend class demuxer;
  65. protected:
  66. // disallow basic constructors
  67. diff -pruN mpgtx-1.3/mpegOut.cxx mpgtx-1.3_new/mpegOut.cxx
  68. --- mpgtx-1.3/mpegOut.cxx 2002-08-30 18:03:12.000000000 +0200
  69. +++ mpgtx-1.3_new/mpegOut.cxx 2005-01-12 17:00:10.654663424 +0100
  70. @@ -7,6 +7,7 @@
  71. ************************************************************/
  72. +#include "mpeg.hh"
  73. #include "mpegOut.hh"
  74. #include "common.hh"
  75. #include <stdio.h>