guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [1/2] incubator-guacamole-server git commit: GUACAMOLE-217: FFmpeg's decoupled I/O functions were not available until libavcodec 57.37.100.
Date Sun, 26 Feb 2017 08:22:56 GMT
Repository: incubator-guacamole-server
Updated Branches:
  refs/heads/staging/0.9.12-incubating a7ee5edd8 -> 6939142d2


GUACAMOLE-217: FFmpeg's decoupled I/O functions were not available until libavcodec 57.37.100.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/d40b2d81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/d40b2d81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/d40b2d81

Branch: refs/heads/staging/0.9.12-incubating
Commit: d40b2d81535abc95572a252d8b2efa6a785fd191
Parents: 4da4ce7
Author: Michael Jumper <mjumper@apache.org>
Authored: Sat Feb 25 19:42:43 2017 -0800
Committer: Michael Jumper <mjumper@apache.org>
Committed: Sat Feb 25 19:42:43 2017 -0800

----------------------------------------------------------------------
 src/guacenc/ffmpeg-compat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/d40b2d81/src/guacenc/ffmpeg-compat.c
----------------------------------------------------------------------
diff --git a/src/guacenc/ffmpeg-compat.c b/src/guacenc/ffmpeg-compat.c
index 218d450..c1b2c68 100644
--- a/src/guacenc/ffmpeg-compat.c
+++ b/src/guacenc/ffmpeg-compat.c
@@ -111,8 +111,8 @@ int guacenc_avcodec_encode_video(guacenc_video* video, AVFrame* frame)
{
     packet.data = NULL;
     packet.size = 0;
 
-/* For libavcodec < 57.16.0: input/output was not decoupled */
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,16,0)
+/* For libavcodec < 57.37.100: input/output was not decoupled */
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,37,100)
     /* Write frame to video */
     int got_data;
     if (avcodec_encode_video2(video->context, &packet, frame, &got_data) <
0) {


Mime
View raw message