Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1565)

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/gifdec.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * GIF decoder 2 * GIF decoder
3 * Copyright (c) 2003 Fabrice Bellard 3 * Copyright (c) 2003 Fabrice Bellard
4 * Copyright (c) 2006 Baptiste Coudurier 4 * Copyright (c) 2006 Baptiste Coudurier
5 * 5 *
6 * This file is part of FFmpeg. 6 * This file is part of FFmpeg.
7 * 7 *
8 * FFmpeg is free software; you can redistribute it and/or 8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 GifState *s = avctx->priv_data; 290 GifState *s = avctx->priv_data;
291 AVFrame *picture = data; 291 AVFrame *picture = data;
292 int ret; 292 int ret;
293 293
294 s->bytestream = buf; 294 s->bytestream = buf;
295 s->bytestream_end = buf + buf_size; 295 s->bytestream_end = buf + buf_size;
296 if (gif_read_header1(s) < 0) 296 if (gif_read_header1(s) < 0)
297 return -1; 297 return -1;
298 298
299 avctx->pix_fmt = PIX_FMT_PAL8; 299 avctx->pix_fmt = PIX_FMT_PAL8;
300 if (av_check_image_size(s->screen_width, s->screen_height, 0, avctx)) 300 if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx))
301 return -1; 301 return -1;
302 avcodec_set_dimensions(avctx, s->screen_width, s->screen_height); 302 avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
303 303
304 if (s->picture.data[0]) 304 if (s->picture.data[0])
305 avctx->release_buffer(avctx, &s->picture); 305 avctx->release_buffer(avctx, &s->picture);
306 if (avctx->get_buffer(avctx, &s->picture) < 0) { 306 if (avctx->get_buffer(avctx, &s->picture) < 0) {
307 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); 307 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
308 return -1; 308 return -1;
309 } 309 }
310 s->image_palette = (uint32_t *)s->picture.data[1]; 310 s->image_palette = (uint32_t *)s->picture.data[1];
(...skipping 21 matching lines...) Expand all
332 AVMEDIA_TYPE_VIDEO, 332 AVMEDIA_TYPE_VIDEO,
333 CODEC_ID_GIF, 333 CODEC_ID_GIF,
334 sizeof(GifState), 334 sizeof(GifState),
335 gif_decode_init, 335 gif_decode_init,
336 NULL, 336 NULL,
337 gif_decode_close, 337 gif_decode_close,
338 gif_decode_frame, 338 gif_decode_frame,
339 CODEC_CAP_DR1, 339 CODEC_CAP_DR1,
340 .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), 340 .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
341 }; 341 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/g722.c ('k') | source/patched-ffmpeg-mt/libavcodec/h263dec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698