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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/pngdec.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 * PNG image format 2 * PNG image format
3 * Copyright (c) 2003 Fabrice Bellard 3 * Copyright (c) 2003 Fabrice Bellard
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 (tag & 0xff), 435 (tag & 0xff),
436 ((tag >> 8) & 0xff), 436 ((tag >> 8) & 0xff),
437 ((tag >> 16) & 0xff), 437 ((tag >> 16) & 0xff),
438 ((tag >> 24) & 0xff), length); 438 ((tag >> 24) & 0xff), length);
439 switch(tag) { 439 switch(tag) {
440 case MKTAG('I', 'H', 'D', 'R'): 440 case MKTAG('I', 'H', 'D', 'R'):
441 if (length != 13) 441 if (length != 13)
442 goto fail; 442 goto fail;
443 s->width = bytestream_get_be32(&s->bytestream); 443 s->width = bytestream_get_be32(&s->bytestream);
444 s->height = bytestream_get_be32(&s->bytestream); 444 s->height = bytestream_get_be32(&s->bytestream);
445 if(av_check_image_size(s->width, s->height, 0, avctx)){ 445 if(av_image_check_size(s->width, s->height, 0, avctx)){
446 s->width= s->height= 0; 446 s->width= s->height= 0;
447 goto fail; 447 goto fail;
448 } 448 }
449 s->bit_depth = *s->bytestream++; 449 s->bit_depth = *s->bytestream++;
450 s->color_type = *s->bytestream++; 450 s->color_type = *s->bytestream++;
451 s->compression_type = *s->bytestream++; 451 s->compression_type = *s->bytestream++;
452 s->filter_type = *s->bytestream++; 452 s->filter_type = *s->bytestream++;
453 s->interlace_type = *s->bytestream++; 453 s->interlace_type = *s->bytestream++;
454 crc = bytestream_get_be32(&s->bytestream); 454 crc = bytestream_get_be32(&s->bytestream);
455 s->state |= PNG_IHDR; 455 s->state |= PNG_IHDR;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 sizeof(PNGDecContext), 664 sizeof(PNGDecContext),
665 png_dec_init, 665 png_dec_init,
666 NULL, 666 NULL,
667 png_dec_end, 667 png_dec_end,
668 decode_frame, 668 decode_frame,
669 CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, 669 CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
670 NULL, 670 NULL,
671 .max_lowres = 5, 671 .max_lowres = 5,
672 .long_name = NULL_IF_CONFIG_SMALL("PNG image"), 672 .long_name = NULL_IF_CONFIG_SMALL("PNG image"),
673 }; 673 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/pictordec.c ('k') | source/patched-ffmpeg-mt/libavcodec/pnm.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698