diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-12-17 18:14:38 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-12-17 18:14:38 +0000 |
| commit | 115329f16062074e11ccf3b89ead6176606c9696 (patch) | |
| tree | e98aa993905a702688bf821737ab9a443969fc28 /libavformat/jpeg.c | |
| parent | d76319b1ab716320f6e6a4d690b85fe4504ebd5b (diff) | |
| download | ffmpeg-115329f16062074e11ccf3b89ead6176606c9696.tar.gz | |
COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/jpeg.c')
| -rw-r--r-- | libavformat/jpeg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/jpeg.c b/libavformat/jpeg.c index bf640d87a6..f957aa49dc 100644 --- a/libavformat/jpeg.c +++ b/libavformat/jpeg.c @@ -68,7 +68,7 @@ static int jpeg_get_buffer(AVCodecContext *c, AVFrame *picture) } } -static void jpeg_img_copy(uint8_t *dst, int dst_wrap, +static void jpeg_img_copy(uint8_t *dst, int dst_wrap, uint8_t *src, int src_wrap, int width, int height) { @@ -82,7 +82,7 @@ static void jpeg_img_copy(uint8_t *dst, int dst_wrap, /* XXX: libavcodec is broken for truncated jpegs! */ #define IO_BUF_SIZE (1024*1024) -static int jpeg_read(ByteIOContext *f, +static int jpeg_read(ByteIOContext *f, int (*alloc_cb)(void *opaque, AVImageInfo *info), void *opaque) { AVCodecContext *c; @@ -94,7 +94,7 @@ static int jpeg_read(ByteIOContext *f, jctx.alloc_cb = alloc_cb; jctx.opaque = opaque; jctx.ret_code = -1; /* default return code is error */ - + c = avcodec_alloc_context(); if (!c) return -1; @@ -114,7 +114,7 @@ static int jpeg_read(ByteIOContext *f, break; inbuf_ptr = inbuf; while (size > 0) { - len = avcodec_decode_video(c, &picture1, &got_picture, + len = avcodec_decode_video(c, &picture1, &got_picture, inbuf_ptr, size); if (len < 0) goto fail; @@ -198,10 +198,10 @@ static int jpeg_write(ByteIOContext *pb, AVImageInfo *info) /* set the quality */ picture->quality = 3; /* XXX: a parameter should be used */ c->flags |= CODEC_FLAG_QSCALE; - + if (avcodec_open(c, &mjpeg_encoder) < 0) goto fail1; - + /* XXX: needs to sort out that size problem */ outbuf_size = 1000000; outbuf = av_malloc(outbuf_size); |