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/rv10.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 * RV10/RV20 decoder 2 * RV10/RV20 decoder
3 * Copyright (c) 2000,2001 Fabrice Bellard 3 * Copyright (c) 2000,2001 Fabrice Bellard
4 * Copyright (c) 2002-2004 Michael Niedermayer 4 * Copyright (c) 2002-2004 Michael Niedermayer
5 * 5 *
6 * This file is part of FFmpeg. 6 * This file is part of FFmpeg.
7 * 7 *
8 * FFmpeg is free software; you can redistribute it and/or 8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 363
364 if(f){ 364 if(f){
365 new_w= 4*((uint8_t*)s->avctx->extradata)[6+2*f]; 365 new_w= 4*((uint8_t*)s->avctx->extradata)[6+2*f];
366 new_h= 4*((uint8_t*)s->avctx->extradata)[7+2*f]; 366 new_h= 4*((uint8_t*)s->avctx->extradata)[7+2*f];
367 }else{ 367 }else{
368 new_w= s->orig_width ; 368 new_w= s->orig_width ;
369 new_h= s->orig_height; 369 new_h= s->orig_height;
370 } 370 }
371 if(new_w != s->width || new_h != s->height){ 371 if(new_w != s->width || new_h != s->height){
372 av_log(s->avctx, AV_LOG_DEBUG, "attempting to change resolution to % dx%d\n", new_w, new_h); 372 av_log(s->avctx, AV_LOG_DEBUG, "attempting to change resolution to % dx%d\n", new_w, new_h);
373 if (av_check_image_size(new_w, new_h, 0, s->avctx) < 0) 373 if (av_image_check_size(new_w, new_h, 0, s->avctx) < 0)
374 return -1; 374 return -1;
375 MPV_common_end(s); 375 MPV_common_end(s);
376 avcodec_set_dimensions(s->avctx, new_w, new_h); 376 avcodec_set_dimensions(s->avctx, new_w, new_h);
377 s->width = new_w; 377 s->width = new_w;
378 s->height = new_h; 378 s->height = new_h;
379 if (MPV_common_init(s) < 0) 379 if (MPV_common_init(s) < 0)
380 return -1; 380 return -1;
381 } 381 }
382 382
383 if(s->avctx->debug & FF_DEBUG_PICT_INFO){ 383 if(s->avctx->debug & FF_DEBUG_PICT_INFO){
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 rv10_decode_init, 730 rv10_decode_init,
731 NULL, 731 NULL,
732 rv10_decode_end, 732 rv10_decode_end,
733 rv10_decode_frame, 733 rv10_decode_frame,
734 CODEC_CAP_DR1 | CODEC_CAP_DELAY, 734 CODEC_CAP_DR1 | CODEC_CAP_DELAY,
735 .flush= ff_mpeg_flush, 735 .flush= ff_mpeg_flush,
736 .max_lowres = 3, 736 .max_lowres = 3,
737 .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), 737 .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
738 .pix_fmts= ff_pixfmt_list_420, 738 .pix_fmts= ff_pixfmt_list_420,
739 }; 739 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/qtrleenc.c ('k') | source/patched-ffmpeg-mt/libavcodec/rv40.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698