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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/dirac.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 * Copyright (C) 2007 Marco Gerards <marco@gnu.org> 2 * Copyright (C) 2007 Marco Gerards <marco@gnu.org>
3 * Copyright (C) 2009 David Conrad 3 * Copyright (C) 2009 David Conrad
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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 if (video_format > 20) 262 if (video_format > 20)
263 return -1; 263 return -1;
264 264
265 // Fill in defaults for the source parameters. 265 // Fill in defaults for the source parameters.
266 *source = dirac_source_parameters_defaults[video_format]; 266 *source = dirac_source_parameters_defaults[video_format];
267 267
268 // Override the defaults. 268 // Override the defaults.
269 if (parse_source_parameters(avctx, gb, source)) 269 if (parse_source_parameters(avctx, gb, source))
270 return -1; 270 return -1;
271 271
272 if (av_check_image_size(source->width, source->height, 0, avctx)) 272 if (av_image_check_size(source->width, source->height, 0, avctx))
273 return -1; 273 return -1;
274 274
275 avcodec_set_dimensions(avctx, source->width, source->height); 275 avcodec_set_dimensions(avctx, source->width, source->height);
276 276
277 // currently only used to signal field coding 277 // currently only used to signal field coding
278 picture_coding_mode = svq3_get_ue_golomb(gb); 278 picture_coding_mode = svq3_get_ue_golomb(gb);
279 if (picture_coding_mode != 0) { 279 if (picture_coding_mode != 0) {
280 av_log(avctx, AV_LOG_ERROR, "Unsupported picture coding mode %d", 280 av_log(avctx, AV_LOG_ERROR, "Unsupported picture coding mode %d",
281 picture_coding_mode); 281 picture_coding_mode);
282 return -1; 282 return -1;
283 } 283 }
284 return 0; 284 return 0;
285 } 285 }
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/dct-test.c ('k') | source/patched-ffmpeg-mt/libavcodec/dnxhddec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698