- support for old api, too

Changed files:
    ffmpeg-x264.patch -> 1.3

diff --git a/ffmpeg-x264.patch b/ffmpeg-x264.patch
index 53af6e8b6efcff7c57fb2c36451443e2b8e77793..df563bcee948c84cce7b4bbd1ca95b7212e8bd25 100644 (file)
--- a/ffmpeg-x264.patch
+++ b/ffmpeg-x264.patch
@@ -1,24 +1,14 @@
---- trunk/libavcodec/x264.c    2006/02/20 19:01:29     5040
-+++ trunk/libavcodec/x264.c    2006/07/18 01:29:43     5780
-@@ -142,13 +142,18 @@
-     x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1);
-     if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1;
-     else{
--        if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf;
--        else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp;
-+        if(avctx->crf){
-+            x4->params.rc.i_rc_method = X264_RC_CRF;
-+            x4->params.rc.f_rf_constant = avctx->crf;
-+        }else if(avctx->cqp > -1){
-+            x4->params.rc.i_rc_method = X264_RC_CQP;
-+            x4->params.rc.i_qp_constant = avctx->cqp;
-+        }
-     }
- 
-     // if neither crf nor cqp modes are selected we have to enable the RC
-     // we do it this way because we cannot check if the bitrate has been set
--    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1;
-+    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR;
+--- ffmpeg/libavcodec/libx264.c.org    2008-09-30 08:13:47.298284337 +0200
++++ ffmpeg/libavcodec/libx264.c        2008-09-30 08:16:20.034103090 +0200
+@@ -162,7 +162,11 @@
  
      x4->params.i_bframe = avctx->max_b_frames;
      x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
++#if X264_BUILD > 60
+     x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
++#else
++    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
++#endif
+     x4->params.i_bframe_bias = avctx->bframebias;
+     x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
+     avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;