From 3ab354d7778cd84bd92e17e5b3563a8180053c8a Mon Sep 17 00:00:00 2001
From: Nicolas George <nicola.george@normalesup.org>
Date: Mon, 25 Oct 2010 14:40:00 +0000
Subject: [PATCH] Make libx264 take the pict_type input parameter into account,
 thus making forced key frames work.

Patch by Nicolas George, nicolas d george a normalesup d org

Originally committed as revision 25567 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/libx264.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 7ce04a62cc..6da7f2ae03 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -100,7 +100,11 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
         }
 
         x4->pic.i_pts  = frame->pts;
-        x4->pic.i_type = X264_TYPE_AUTO;
+        x4->pic.i_type =
+            frame->pict_type == FF_I_TYPE ? X264_TYPE_KEYFRAME :
+            frame->pict_type == FF_P_TYPE ? X264_TYPE_P :
+            frame->pict_type == FF_B_TYPE ? X264_TYPE_B :
+                                            X264_TYPE_AUTO;
     }
 
     do {