Changeset 1012

Timestamp:

01/17/09 01:47:22 (20 months ago)

Author:

astrange

Message:

Update ffmpeg patches

Location:

trunk/Patches

Files:

• ffmpeg-forceinline.diff (modified) (2 diffs)
• ffmpeg-h264dsp-crash.diff (modified) (1 diff)

trunk/Patches/ffmpeg-forceinline.diff

@@ -6 +6 @@
  }
  
- #ifndef CONFIG_SMALL
+ #if !CONFIG_SMALL
 -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 ) {
 +static 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 ) {
@@ -20 +20 @@
 -static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
 +static 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 ) {
- #ifdef CONFIG_SMALL
+ #if CONFIG_SMALL
      decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, cat == 0 || cat == 3);
  #else

trunk/Patches/ffmpeg-h264dsp-crash.diff

@@ -9 +9 @@
 +#undef  H264_QPEL_FUNCS
 +#define H264_QPEL_FUNCS(x, y, CPU) 
- #ifdef HAVE_SSSE3
+ #if HAVE_SSSE3
          if(mm_flags & MM_SSSE3){
              H264_QPEL_FUNCS(1, 0, ssse3);