comparison mpeg12.c @ 9660:6d75bcdeaa30 libavcodec

mpeg12: fix non-standard use of "extern inline" Rename ff_mpeg1_decode_block_intra to mpeg1_decode_block_intra and make it static. Add ff_mpeg1_decode_block_intra as plain extern function calling mpeg1_decode_block_intra.
author mru
date Sun, 17 May 2009 00:54:29 +0000
parents 15660ad4c641
children 34be4ff86302
comparison
equal deleted inserted replaced
9659:b4350a6fb24a 9660:6d75bcdeaa30
318 return -1; 318 return -1;
319 } 319 }
320 } 320 }
321 } else { 321 } else {
322 for(i=0;i<6;i++) { 322 for(i=0;i<6;i++) {
323 if (ff_mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0) 323 if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
324 return -1; 324 return -1;
325 } 325 }
326 } 326 }
327 } else { 327 } else {
328 if (mb_type & MB_TYPE_ZERO_MV){ 328 if (mb_type & MB_TYPE_ZERO_MV){
603 l= INT_BIT - 5 - shift; 603 l= INT_BIT - 5 - shift;
604 val = (val<<l)>>l; 604 val = (val<<l)>>l;
605 return val; 605 return val;
606 } 606 }
607 607
608 inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, 608 static inline int mpeg1_decode_block_intra(MpegEncContext *s,
609 DCTELEM *block, 609 DCTELEM *block,
610 int n) 610 int n)
611 { 611 {
612 int level, dc, diff, i, j, run; 612 int level, dc, diff, i, j, run;
613 int component; 613 int component;
674 } 674 }
675 CLOSE_READER(re, &s->gb); 675 CLOSE_READER(re, &s->gb);
676 } 676 }
677 s->block_last_index[n] = i; 677 s->block_last_index[n] = i;
678 return 0; 678 return 0;
679 }
680
681 int ff_mpeg1_decode_block_intra(MpegEncContext *s,
682 DCTELEM *block,
683 int n)
684 {
685 return mpeg1_decode_block_intra(s, block, n);
679 } 686 }
680 687
681 static inline int mpeg1_decode_block_inter(MpegEncContext *s, 688 static inline int mpeg1_decode_block_inter(MpegEncContext *s,
682 DCTELEM *block, 689 DCTELEM *block,
683 int n) 690 int n)