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

This commit is contained in:
Nick Couchman 2018-11-21 07:24:20 -05:00
commit bbb6afaf46

View File

@ -75,8 +75,10 @@ int main(int argc, char* argv[]) {
guacenc_log(GUAC_LOG_INFO, "Guacamole video encoder (guacenc) " guacenc_log(GUAC_LOG_INFO, "Guacamole video encoder (guacenc) "
"version " VERSION); "version " VERSION);
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)
/* Prepare libavcodec */ /* Prepare libavcodec */
avcodec_register_all(); avcodec_register_all();
#endif
/* Track number of overall failures */ /* Track number of overall failures */
int total_files = argc - optind; int total_files = argc - optind;