← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ffmpeg/libswscale/swscale.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/libswscale/swscale.h
15
15
 *
16
16
 * You should have received a copy of the GNU Lesser General Public
17
17
 * License along with FFmpeg; if not, write to the Free Software
18
 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
19
 */
20
20
 
21
 
#ifndef SWSCALE_H
22
 
#define SWSCALE_H
 
21
#ifndef FFMPEG_SWSCALE_H
 
22
#define FFMPEG_SWSCALE_H
23
23
 
24
24
/**
25
25
 * @file swscale.h
27
27
 *     external api for the swscale stuff
28
28
 */
29
29
 
30
 
#include "avutil.h"
31
 
 
32
 
#ifdef __cplusplus
33
 
extern "C" {
34
 
#endif
35
 
 
36
 
#define AV_STRINGIFY(s)         AV_TOSTRING(s)
37
 
#define AV_TOSTRING(s) #s
38
 
 
39
 
#define LIBSWSCALE_VERSION_INT  ((0<<16)+(5<<8)+0)
40
 
#define LIBSWSCALE_VERSION      0.5.0
 
30
#include "libavutil/avutil.h"
 
31
 
 
32
#define LIBSWSCALE_VERSION_MAJOR 0
 
33
#define LIBSWSCALE_VERSION_MINOR 5
 
34
#define LIBSWSCALE_VERSION_MICRO 1
 
35
 
 
36
#define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
 
37
                                               LIBSWSCALE_VERSION_MINOR, \
 
38
                                               LIBSWSCALE_VERSION_MICRO)
 
39
#define LIBSWSCALE_VERSION      AV_VERSION(LIBSWSCALE_VERSION_MAJOR, \
 
40
                                           LIBSWSCALE_VERSION_MINOR, \
 
41
                                           LIBSWSCALE_VERSION_MICRO)
41
42
#define LIBSWSCALE_BUILD        LIBSWSCALE_VERSION_INT
42
43
 
43
44
#define LIBSWSCALE_IDENT        "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
62
63
 
63
64
#define SWS_PRINT_INFO              0x1000
64
65
 
65
 
//the following 3 flags are not completly implemented
66
 
//internal chrominace subsamling info
 
66
//the following 3 flags are not completely implemented
 
67
//internal chrominace subsampling info
67
68
#define SWS_FULL_CHR_H_INT    0x2000
68
69
//input subsampling info
69
70
#define SWS_FULL_CHR_H_INP    0x4000
74
75
#define SWS_CPU_CAPS_MMX2     0x20000000
75
76
#define SWS_CPU_CAPS_3DNOW    0x40000000
76
77
#define SWS_CPU_CAPS_ALTIVEC  0x10000000
 
78
#define SWS_CPU_CAPS_BFIN     0x01000000
77
79
 
78
80
#define SWS_MAX_REDUCE_CUTOFF 0.002
79
81
 
141
143
                                        int dstW, int dstH, int dstFormat, int flags,
142
144
                                        SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
143
145
 
144
 
#ifdef __cplusplus
145
 
}
146
 
#endif
147
 
 
148
 
#endif
 
146
#endif /* FFMPEG_SWSCALE_H */