You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/11/21 12:25:27 UTC

[1/2] guacamole-server git commit: GUACAMOLE-638: avcodec_register_all() should be used only if not deprecated.

Repository: guacamole-server
Updated Branches:
  refs/heads/master 0d435e243 -> bbb6afaf4


GUACAMOLE-638: avcodec_register_all() should be used only if not deprecated.


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

Branch: refs/heads/master
Commit: 867e63b52473d962183eac98240ea4831286ab90
Parents: 0d435e2
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Oct 19 12:43:08 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Nov 12 16:36:15 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/867e63b5/src/guacenc/guacenc.c
----------------------------------------------------------------------
diff --git a/src/guacenc/guacenc.c b/src/guacenc/guacenc.c
index e8442fd..093623a 100644
--- a/src/guacenc/guacenc.c
+++ b/src/guacenc/guacenc.c
@@ -75,8 +75,10 @@ int main(int argc, char* argv[]) {
     guacenc_log(GUAC_LOG_INFO, "Guacamole video encoder (guacenc) "
             "version " VERSION);
 
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)
     /* Prepare libavcodec */
     avcodec_register_all();
+#endif
 
     /* Track number of overall failures */
     int total_files = argc - optind;


[2/2] guacamole-server git commit: GUACAMOLE-638: Merge avcodec_register_all() should be used only if not deprecated.

Posted by vn...@apache.org.
GUACAMOLE-638: Merge avcodec_register_all() should be used only if not deprecated.


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

Branch: refs/heads/master
Commit: bbb6afaf462f6930a589f962302806c52f350c0b
Parents: 0d435e2 867e63b
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Nov 21 07:24:20 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed Nov 21 07:24:20 2018 -0500

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