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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/rv40.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 * RV40 decoder 2 * RV40 decoder
3 * Copyright (c) 2007 Konstantin Shishkov 3 * Copyright (c) 2007 Konstantin Shishkov
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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 si->type = get_bits(gb, 2); 137 si->type = get_bits(gb, 2);
138 if(si->type == 1) si->type = 0; 138 if(si->type == 1) si->type = 0;
139 si->quant = get_bits(gb, 5); 139 si->quant = get_bits(gb, 5);
140 if(get_bits(gb, 2)) 140 if(get_bits(gb, 2))
141 return -1; 141 return -1;
142 si->vlc_set = get_bits(gb, 2); 142 si->vlc_set = get_bits(gb, 2);
143 skip_bits1(gb); 143 skip_bits1(gb);
144 si->pts = get_bits(gb, 13); 144 si->pts = get_bits(gb, 13);
145 if(!si->type || !get_bits1(gb)) 145 if(!si->type || !get_bits1(gb))
146 rv40_parse_picture_size(gb, &w, &h); 146 rv40_parse_picture_size(gb, &w, &h);
147 if(av_check_image_size(w, h, 0, r->s.avctx) < 0) 147 if(av_image_check_size(w, h, 0, r->s.avctx) < 0)
148 return -1; 148 return -1;
149 si->width = w; 149 si->width = w;
150 si->height = h; 150 si->height = h;
151 mb_size = ((w + 15) >> 4) * ((h + 15) >> 4); 151 mb_size = ((w + 15) >> 4) * ((h + 15) >> 4);
152 mb_bits = ff_rv34_get_start_offset(gb, mb_size); 152 mb_bits = ff_rv34_get_start_offset(gb, mb_size);
153 si->start = get_bits(gb, mb_bits); 153 si->start = get_bits(gb, mb_bits);
154 154
155 return 0; 155 return 0;
156 } 156 }
157 157
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 sizeof(RV34DecContext), 675 sizeof(RV34DecContext),
676 rv40_decode_init, 676 rv40_decode_init,
677 NULL, 677 NULL,
678 ff_rv34_decode_end, 678 ff_rv34_decode_end,
679 ff_rv34_decode_frame, 679 ff_rv34_decode_frame,
680 CODEC_CAP_DR1 | CODEC_CAP_DELAY, 680 CODEC_CAP_DR1 | CODEC_CAP_DELAY,
681 .flush = ff_mpeg_flush, 681 .flush = ff_mpeg_flush,
682 .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), 682 .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"),
683 .pix_fmts= ff_pixfmt_list_420, 683 .pix_fmts= ff_pixfmt_list_420,
684 }; 684 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/rv10.c ('k') | source/patched-ffmpeg-mt/libavcodec/sgidec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698