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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/sunrast.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 * Sun Rasterfile (.sun/.ras/im{1,8,24}/.sunras) image decoder 2 * Sun Rasterfile (.sun/.ras/im{1,8,24}/.sunras) image decoder
3 * Copyright (c) 2007, 2008 Ivo van Poorten 3 * Copyright (c) 2007, 2008 Ivo van Poorten
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_B GR24; 91 avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_B GR24;
92 break; 92 break;
93 default: 93 default:
94 av_log(avctx, AV_LOG_ERROR, "invalid depth\n"); 94 av_log(avctx, AV_LOG_ERROR, "invalid depth\n");
95 return -1; 95 return -1;
96 } 96 }
97 97
98 if (p->data[0]) 98 if (p->data[0])
99 avctx->release_buffer(avctx, p); 99 avctx->release_buffer(avctx, p);
100 100
101 if (av_check_image_size(w, h, 0, avctx)) 101 if (av_image_check_size(w, h, 0, avctx))
102 return -1; 102 return -1;
103 if (w != avctx->width || h != avctx->height) 103 if (w != avctx->width || h != avctx->height)
104 avcodec_set_dimensions(avctx, w, h); 104 avcodec_set_dimensions(avctx, w, h);
105 if (avctx->get_buffer(avctx, p) < 0) { 105 if (avctx->get_buffer(avctx, p) < 0) {
106 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); 106 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
107 return -1; 107 return -1;
108 } 108 }
109 109
110 p->pict_type = FF_I_TYPE; 110 p->pict_type = FF_I_TYPE;
111 111
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 CODEC_ID_SUNRAST, 190 CODEC_ID_SUNRAST,
191 sizeof(SUNRASTContext), 191 sizeof(SUNRASTContext),
192 sunrast_init, 192 sunrast_init,
193 NULL, 193 NULL,
194 sunrast_end, 194 sunrast_end,
195 sunrast_decode_frame, 195 sunrast_decode_frame,
196 CODEC_CAP_DR1, 196 CODEC_CAP_DR1,
197 NULL, 197 NULL,
198 .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), 198 .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
199 }; 199 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/sp5xdec.c ('k') | source/patched-ffmpeg-mt/libavcodec/targa.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698