← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/avi/intern/mjpeg.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2005-11-06 12:40:03 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051106124003-3pgs7tcg5rox96xg
Tags: 2.37a-1.1
http://bugs.debian.org/333958
* Non-maintainer upload.
* Split out parts of 01_SConstruct_debian.dpatch again: root_build_dir
  really needs to get adjusted before the clean target runs - closes: #333958,
  see #288882 for reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/avi/intern/mjpeg.c
3
3
 *
4
4
 * This is external code. Converts between avi and mpeg/jpeg.
5
5
 *
6
 
 * $Id: mjpeg.c,v 1.3 2002/11/25 12:01:51 mein Exp $ 
 
6
 * $Id: mjpeg.c,v 1.4 2005/03/09 19:45:53 lukep Exp $ 
7
7
 *
8
8
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
9
9
 *
146
146
            bits_ac_chrominance, val_ac_chrominance);
147
147
}
148
148
 
149
 
static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, int width, int height, int bufsize) {
150
 
        int rowstride, y;
 
149
static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsigned int width, unsigned int height, int bufsize) {
 
150
        int rowstride;
 
151
        unsigned int y;
151
152
        struct jpeg_decompress_struct dinfo;
152
153
        struct jpeg_error_mgr jerr;
153
154
 
196
197
}
197
198
 
198
199
static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char *inBuffer, int width, int height, int bufsize) {
199
 
        int i, y, rowstride;
 
200
        int i, rowstride;
 
201
        unsigned int y;
200
202
        struct jpeg_compress_struct cinfo;
201
203
        struct jpeg_error_mgr jerr;
202
204
        unsigned char marker[60];