diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2014-07-22 09:59:01 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2014-07-22 09:59:01 +0000 |
| commit | 0e90ccad241dd8fcede6ed7a34829bb12e55925c (patch) | |
| tree | 9cbfffdb23c450ee811b23ed120920e674f8f39d /multimedia/mjpegtools | |
| parent | Don't attempt to define NULL if it is already set. (diff) | |
Fix two problems.
Use class instead of struct for RateCtl in encoderparams.hh. Class RateCtl is
defined in ratectl.hh and used elsewhere in the code too.
Fix headerguard typo in ontheflyratectlpass[12].hh.
Found by: Clang
Notes
Notes:
svn path=/head/; revision=362527
Diffstat (limited to 'multimedia/mjpegtools')
4 files changed, 33 insertions, 1 deletions
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 38280cdcd7e6..45c8b5f1e310 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= mjpegtools PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION} diff --git a/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh b/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh new file mode 100644 index 000000000000..87d751233614 --- /dev/null +++ b/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh @@ -0,0 +1,14 @@ +Use class RateCtl instead of struct. +Class RateCtl is defined in ratectl.hh and used elsewhere in the code too. + +--- ./mpeg2enc/encoderparams.hh.orig 2014-07-21 16:50:46.000000000 +0200 ++++ ./mpeg2enc/encoderparams.hh 2014-07-21 16:50:56.000000000 +0200 +@@ -79,7 +79,7 @@ + }; + + +-struct RateCtl; ++class RateCtl; + class MPEG2EncOptions; + + class EncoderParams diff --git a/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh new file mode 100644 index 000000000000..2ab2038a0a60 --- /dev/null +++ b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh @@ -0,0 +1,9 @@ +--- mpeg2enc/ontheflyratectlpass1.hh.orig 2014-07-21 16:51:41.000000000 +0200 ++++ mpeg2enc/ontheflyratectlpass1.hh 2014-07-21 16:52:29.000000000 +0200 +@@ -1,5 +1,5 @@ + #ifndef _ONTHEFLYRATECTLPASS1_HH +-#define _ONTHELFYRATECTLPASS1_HH ++#define _ONTHEFLYRATECTLPASS1_HH + + /* (C) 2003 Andrew Stevens */ + diff --git a/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh new file mode 100644 index 000000000000..9353f0068a32 --- /dev/null +++ b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh @@ -0,0 +1,9 @@ +--- mpeg2enc/ontheflyratectlpass2.hh.orig 2014-07-21 16:51:46.000000000 +0200 ++++ mpeg2enc/ontheflyratectlpass2.hh 2014-07-21 16:52:33.000000000 +0200 +@@ -1,5 +1,5 @@ + #ifndef _ONTHEFLYRATECTLPASS2_HH +-#define _ONTHELFYRATECTLPASS2_HH ++#define _ONTHEFLYRATECTLPASS2_HH + + /* (C) 2003 Andrew Stevens */ + |