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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/pcx.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 * PC Paintbrush PCX (.pcx) image decoder 2 * PC Paintbrush PCX (.pcx) image decoder
3 * Copyright (c) 2007, 2008 Ivo van Poorten 3 * Copyright (c) 2007, 2008 Ivo van Poorten
4 * 4 *
5 * This decoder does not support CGA palettes. I am unable to find samples 5 * This decoder does not support CGA palettes. I am unable to find samples
6 * and Netpbm cannot generate them. 6 * and Netpbm cannot generate them.
7 * 7 *
8 * This file is part of FFmpeg. 8 * This file is part of FFmpeg.
9 * 9 *
10 * FFmpeg is free software; you can redistribute it and/or 10 * FFmpeg is free software; you can redistribute it and/or
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 default: 136 default:
137 av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n"); 137 av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
138 return -1; 138 return -1;
139 } 139 }
140 140
141 buf += 128; 141 buf += 128;
142 142
143 if (p->data[0]) 143 if (p->data[0])
144 avctx->release_buffer(avctx, p); 144 avctx->release_buffer(avctx, p);
145 145
146 if (av_check_image_size(w, h, 0, avctx)) 146 if (av_image_check_size(w, h, 0, avctx))
147 return -1; 147 return -1;
148 if (w != avctx->width || h != avctx->height) 148 if (w != avctx->width || h != avctx->height)
149 avcodec_set_dimensions(avctx, w, h); 149 avcodec_set_dimensions(avctx, w, h);
150 if (avctx->get_buffer(avctx, p) < 0) { 150 if (avctx->get_buffer(avctx, p) < 0) {
151 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); 151 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
152 return -1; 152 return -1;
153 } 153 }
154 154
155 p->pict_type = FF_I_TYPE; 155 p->pict_type = FF_I_TYPE;
156 156
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 CODEC_ID_PCX, 253 CODEC_ID_PCX,
254 sizeof(PCXContext), 254 sizeof(PCXContext),
255 pcx_init, 255 pcx_init,
256 NULL, 256 NULL,
257 pcx_end, 257 pcx_end,
258 pcx_decode_frame, 258 pcx_decode_frame,
259 CODEC_CAP_DR1, 259 CODEC_CAP_DR1,
260 NULL, 260 NULL,
261 .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), 261 .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
262 }; 262 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/nuv.c ('k') | source/patched-ffmpeg-mt/libavcodec/pgssubdec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698