← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/rational.h

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/rational.h
17
17
 * You should have received a copy of the GNU Lesser General Public
18
18
 * License along with FFmpeg; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 
 *
21
20
 */
22
21
 
23
22
/**
26
25
 * @author Michael Niedermayer <michaelni@gmx.at>
27
26
 */
28
27
 
29
 
#ifndef RATIONAL_H
30
 
#define RATIONAL_H
 
28
#ifndef FFMPEG_RATIONAL_H
 
29
#define FFMPEG_RATIONAL_H
 
30
 
 
31
#include <stdint.h>
 
32
#include "common.h"
31
33
 
32
34
/**
33
35
 * Rational number num/den.
77
79
 * @param c second rational.
78
80
 * @return b*c.
79
81
 */
80
 
AVRational av_mul_q(AVRational b, AVRational c);
 
82
AVRational av_mul_q(AVRational b, AVRational c) av_const;
81
83
 
82
84
/**
83
85
 * Divides one rational by another.
85
87
 * @param c second rational.
86
88
 * @return b/c.
87
89
 */
88
 
AVRational av_div_q(AVRational b, AVRational c);
 
90
AVRational av_div_q(AVRational b, AVRational c) av_const;
89
91
 
90
92
/**
91
93
 * Adds two rationals.
93
95
 * @param c second rational.
94
96
 * @return b+c.
95
97
 */
96
 
AVRational av_add_q(AVRational b, AVRational c);
 
98
AVRational av_add_q(AVRational b, AVRational c) av_const;
97
99
 
98
100
/**
99
101
 * Subtracts one rational from another.
100
102
 * @param b first rational.
101
103
 * @param c second rational.
102
 
 * returns b-c.
 
104
 * @return b-c.
103
105
 */
104
 
AVRational av_sub_q(AVRational b, AVRational c);
 
106
AVRational av_sub_q(AVRational b, AVRational c) av_const;
105
107
 
106
108
/**
107
109
 * Converts a double precision floating point number to a rational.
109
111
 * @param max the maximum allowed numerator and denominator
110
112
 * @return (AVRational) d.
111
113
 */
112
 
AVRational av_d2q(double d, int max);
 
114
AVRational av_d2q(double d, int max) av_const;
113
115
 
114
 
#endif // RATIONAL_H
 
116
#endif /* FFMPEG_RATIONAL_H */