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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/flvdec.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 * FLV decoding. 2 * FLV decoding.
3 * This file is part of FFmpeg. 3 * This file is part of FFmpeg.
4 * 4 *
5 * FFmpeg is free software; you can redistribute it and/or 5 * FFmpeg is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public 6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version. 8 * version 2.1 of the License, or (at your option) any later version.
9 * 9 *
10 * FFmpeg is distributed in the hope that it will be useful, 10 * FFmpeg is distributed in the hope that it will be useful,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 height = 240; 76 height = 240;
77 break; 77 break;
78 case 6: 78 case 6:
79 width = 160; 79 width = 160;
80 height = 120; 80 height = 120;
81 break; 81 break;
82 default: 82 default:
83 width = height = 0; 83 width = height = 0;
84 break; 84 break;
85 } 85 }
86 if(av_check_image_size(width, height, 0, s->avctx)) 86 if(av_image_check_size(width, height, 0, s->avctx))
87 return -1; 87 return -1;
88 s->width = width; 88 s->width = width;
89 s->height = height; 89 s->height = height;
90 90
91 s->pict_type = FF_I_TYPE + get_bits(&s->gb, 2); 91 s->pict_type = FF_I_TYPE + get_bits(&s->gb, 2);
92 s->dropable= s->pict_type > FF_P_TYPE; 92 s->dropable= s->pict_type > FF_P_TYPE;
93 if (s->dropable) 93 if (s->dropable)
94 s->pict_type = FF_P_TYPE; 94 s->pict_type = FF_P_TYPE;
95 95
96 skip_bits1(&s->gb); /* deblocking flag */ 96 skip_bits1(&s->gb); /* deblocking flag */
(...skipping 28 matching lines...) Expand all
125 sizeof(MpegEncContext), 125 sizeof(MpegEncContext),
126 ff_h263_decode_init, 126 ff_h263_decode_init,
127 NULL, 127 NULL,
128 ff_h263_decode_end, 128 ff_h263_decode_end,
129 ff_h263_decode_frame, 129 ff_h263_decode_frame,
130 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, 130 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
131 .max_lowres= 3, 131 .max_lowres= 3,
132 .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Soren son H.263"), 132 .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Soren son H.263"),
133 .pix_fmts= ff_pixfmt_list_420, 133 .pix_fmts= ff_pixfmt_list_420,
134 }; 134 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/fft-test.c ('k') | source/patched-ffmpeg-mt/libavcodec/g722.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698