| @@ -47,3 +47,43 @@
};
/*****************************************************************************
+--- modules/codec/ffmpeg/encoder.c.orig 2008-12-29 09:38:24.000000000 +0100
++++ modules/codec/ffmpeg/encoder.c 2008-12-29 09:42:47.000000000 +0100
+@@ -504,8 +504,12 @@
+ #endif
+ }
+
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ if ( p_sys->b_trellis )
+ p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
++#else
++ p_context->trellis = p_sys->b_trellis;
++#endif
+
+ if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
+ p_context->flags |= CODEC_FLAG_QSCALE;
+@@ -809,7 +813,11 @@
+ if ( current_date + HURRY_UP_GUARD3 > frame.pts )
+ {
+ p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE;
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ p_sys->p_context->flags &= ~CODEC_FLAG_TRELLIS_QUANT;
++#else
++ p_sys->p_context->trellis = 0;
++#endif
+ msg_Dbg( p_enc, "hurry up mode 3" );
+ }
+ else
+@@ -827,8 +835,12 @@
+ }
+ else
+ {
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ if ( p_sys->b_trellis )
+ p_sys->p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
++#else
++ p_sys->p_context->trellis = p_sys->b_trellis;
++#endif
+ #if LIBAVCODEC_BUILD >= 4690
+ p_sys->p_context->noise_reduction =
+ p_sys->i_noise_reduction;
|
