root/branches/perian-1.1/Patches/ffmpeg-forceinline.diff

Revision 923, 1.5 kB (checked in by astrange, 4 months ago)

Merge trunk to the branch.
Disable ssse3 qpel stuff (https://roundup.mplayerhq.hu/roundup/ffmpeg/issue463)

  • ffmpeg/libavcodec/h264.c

    old new  
    53685368} 
    53695369 
    53705370#ifndef CONFIG_SMALL 
    5371 static void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { 
     5371static av_noinline void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { 
    53725372    decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 1); 
    53735373} 
    53745374 
    5375 static void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { 
     5375static av_noinline void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { 
    53765376    decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 0); 
    53775377} 
    53785378#endif 
    53795379 
    5380 static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { 
     5380static av_always_inline void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { 
    53815381#ifdef CONFIG_SMALL 
    53825382    decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, cat == 0 || cat == 3); 
    53835383#else 
Note: See TracBrowser for help on using the browser.