generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Previous commit missed an initialization - this fixes FATE's test sample.

Browse Source 
Originally committed as revision 13131 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alexander Strange 2008-05-11 23:39:55 +00:00
parent eacced45c4
commit 5da1ab1ae1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/svq3.c
View File

@ -681,11 +681,9 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) {
static int svq3_decode_slice_header (H264Context *h) { static int svq3_decode_slice_header (H264Context *h) {
MpegEncContext *const s = (MpegEncContext *) h; MpegEncContext *const s = (MpegEncContext *) h;
int mb_xy; const int mb_xy = h->mb_xy;
int i, header; int i, header;
mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
header = get_bits (&s->gb, 8); header = get_bits (&s->gb, 8);
if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) { if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {
@ -844,7 +842,7 @@ static int svq3_decode_frame (AVCodecContext *avctx,
init_get_bits (&s->gb, buf, 8*buf_size); init_get_bits (&s->gb, buf, 8*buf_size);
s->mb_x = s->mb_y = 0; s->mb_x = s->mb_y = h->mb_xy = 0;
if (svq3_decode_slice_header (h)) if (svq3_decode_slice_header (h))
return -1; return -1;
@ -917,6 +915,7 @@ static int svq3_decode_frame (AVCodecContext *avctx,
for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) {
for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) {
h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits &&
((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { ((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) {