[vlc-commits] x265: update for API 6

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Mar  7 15:55:27 2014 +0100| [f61700fd0796a0b43abcacbd99b9851678662908] | committer: Rafaël Carré

x265: update for API 6

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f61700fd0796a0b43abcacbd99b9851678662908
---

 modules/codec/x265.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/codec/x265.c b/modules/codec/x265.c
index 860878b..a2abd45 100644
--- a/modules/codec/x265.c
+++ b/modules/codec/x265.c
@@ -167,8 +167,13 @@ static int  Open (vlc_object_t *p_this)
     param->bEnableWavefront = 0; // buggy in x265, use frame threading for now
     param->maxCUSize = 16; /* use smaller macroblock */
 
+#if X265_BUILD >= 6
+    param->fpsNum = p_enc->fmt_in.video.i_frame_rate;
+    param->fpsDenom = p_enc->fmt_in.video.i_frame_rate_base;
+#else
     param->frameRate = p_enc->fmt_in.video.i_frame_rate /
             p_enc->fmt_in.video.i_frame_rate_base;
+#endif
     param->sourceWidth = p_enc->fmt_in.video.i_visible_width;
     param->sourceHeight = p_enc->fmt_in.video.i_visible_height;