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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/kgv1dec.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 * Kega Game Video (KGV1) decoder 2 * Kega Game Video (KGV1) decoder
3 * Copyright (c) 2010 Daniel Verkamp 3 * Copyright (c) 2010 Daniel Verkamp
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 int outcnt = 0, maxcnt; 44 int outcnt = 0, maxcnt;
45 int w, h, i; 45 int w, h, i;
46 46
47 if (avpkt->size < 2) 47 if (avpkt->size < 2)
48 return -1; 48 return -1;
49 49
50 w = (buf[0] + 1) * 8; 50 w = (buf[0] + 1) * 8;
51 h = (buf[1] + 1) * 8; 51 h = (buf[1] + 1) * 8;
52 buf += 2; 52 buf += 2;
53 53
54 if (av_check_image_size(w, h, 0, avctx)) 54 if (av_image_check_size(w, h, 0, avctx))
55 return -1; 55 return -1;
56 56
57 if (w != avctx->width || h != avctx->height) 57 if (w != avctx->width || h != avctx->height)
58 avcodec_set_dimensions(avctx, w, h); 58 avcodec_set_dimensions(avctx, w, h);
59 59
60 maxcnt = w * h; 60 maxcnt = w * h;
61 61
62 out = av_realloc(c->cur, w * h * 2); 62 out = av_realloc(c->cur, w * h * 2);
63 if (!out) 63 if (!out)
64 return -1; 64 return -1;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 AVMEDIA_TYPE_VIDEO, 169 AVMEDIA_TYPE_VIDEO,
170 CODEC_ID_KGV1, 170 CODEC_ID_KGV1,
171 sizeof(KgvContext), 171 sizeof(KgvContext),
172 decode_init, 172 decode_init,
173 NULL, 173 NULL,
174 decode_end, 174 decode_end,
175 decode_frame, 175 decode_frame,
176 .max_lowres = 1, 176 .max_lowres = 1,
177 .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), 177 .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"),
178 }; 178 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/indeo3.c ('k') | source/patched-ffmpeg-mt/libavcodec/libdiracdec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698