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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/dpx.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 * DPX (.dpx) image decoder 2 * DPX (.dpx) image decoder
3 * Copyright (c) 2009 Jimmy Christensen 3 * Copyright (c) 2009 Jimmy Christensen
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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 target_packet_size = 6; 133 target_packet_size = 6;
134 source_packet_size = elements * 2; 134 source_packet_size = elements * 2;
135 break; 135 break;
136 default: 136 default:
137 av_log(avctx, AV_LOG_ERROR, "Unsupported color depth : %d\n", bits_p er_color); 137 av_log(avctx, AV_LOG_ERROR, "Unsupported color depth : %d\n", bits_p er_color);
138 return -1; 138 return -1;
139 } 139 }
140 140
141 if (s->picture.data[0]) 141 if (s->picture.data[0])
142 avctx->release_buffer(avctx, &s->picture); 142 avctx->release_buffer(avctx, &s->picture);
143 if (av_check_image_size(w, h, 0, avctx)) 143 if (av_image_check_size(w, h, 0, avctx))
144 return -1; 144 return -1;
145 if (w != avctx->width || h != avctx->height) 145 if (w != avctx->width || h != avctx->height)
146 avcodec_set_dimensions(avctx, w, h); 146 avcodec_set_dimensions(avctx, w, h);
147 if (avctx->get_buffer(avctx, p) < 0) { 147 if (avctx->get_buffer(avctx, p) < 0) {
148 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); 148 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
149 return -1; 149 return -1;
150 } 150 }
151 151
152 // Move pointer to offset from start of file 152 // Move pointer to offset from start of file
153 buf = avpkt->data + offset; 153 buf = avpkt->data + offset;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 CODEC_ID_DPX, 221 CODEC_ID_DPX,
222 sizeof(DPXContext), 222 sizeof(DPXContext),
223 decode_init, 223 decode_init,
224 NULL, 224 NULL,
225 decode_end, 225 decode_end,
226 decode_frame, 226 decode_frame,
227 0, 227 0,
228 NULL, 228 NULL,
229 .long_name = NULL_IF_CONFIG_SMALL("DPX image"), 229 .long_name = NULL_IF_CONFIG_SMALL("DPX image"),
230 }; 230 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/dnxhddec.c ('k') | source/patched-ffmpeg-mt/libavcodec/dsputil.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698