comparison mpeg12.c @ 533:3c07cf9595de libavcodec

adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
author michaelni
date Wed, 10 Jul 2002 21:01:45 +0000
parents 19a5e2a81e1a
children 6df843af36cb
comparison
equal deleted inserted replaced
532:d2147d9704ce 533:3c07cf9595de
1538 dprintf(" %d", s->intra_matrix[zigzag_direct[i]]); 1538 dprintf(" %d", s->intra_matrix[zigzag_direct[i]]);
1539 printf("\n"); 1539 printf("\n");
1540 #endif 1540 #endif
1541 } else { 1541 } else {
1542 for(i=0;i<64;i++) { 1542 for(i=0;i<64;i++) {
1543 v = default_intra_matrix[i]; 1543 v = ff_mpeg1_default_intra_matrix[i];
1544 s->intra_matrix[i] = v; 1544 s->intra_matrix[i] = v;
1545 s->chroma_intra_matrix[i] = v; 1545 s->chroma_intra_matrix[i] = v;
1546 } 1546 }
1547 } 1547 }
1548 if (get_bits1(&s->gb)) { 1548 if (get_bits1(&s->gb)) {
1558 dprintf(" %d", s->inter_matrix[zigzag_direct[i]]); 1558 dprintf(" %d", s->inter_matrix[zigzag_direct[i]]);
1559 printf("\n"); 1559 printf("\n");
1560 #endif 1560 #endif
1561 } else { 1561 } else {
1562 for(i=0;i<64;i++) { 1562 for(i=0;i<64;i++) {
1563 v = default_non_intra_matrix[i]; 1563 v = ff_mpeg1_default_non_intra_matrix[i];
1564 s->inter_matrix[i] = v; 1564 s->inter_matrix[i] = v;
1565 s->chroma_inter_matrix[i] = v; 1565 s->chroma_inter_matrix[i] = v;
1566 } 1566 }
1567 } 1567 }
1568 1568