diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp
index 897f9fc49..30a3405df 100644
--- a/lib/libdvbsub/dvbsubtitle.cpp
+++ b/lib/libdvbsub/dvbsubtitle.cpp
@@ -171,7 +171,9 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
 	avctx = NULL;
 	avcodec = NULL;
 
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
 	avcodec_register_all();
+#endif
 	avcodec = avcodec_find_decoder(CODEC_DVB_SUB);//CODEC_ID_DVB_SUBTITLE or AV_CODEC_ID_DVB_SUBTITLE from 57.1.100
 	if (!avcodec) {
 		dbgconverter("cDvbSubtitleConverter: unable to get dvb subtitle codec!\n");
diff --git a/src/driver/audiodec/ffmpegdec.cpp b/src/driver/audiodec/ffmpegdec.cpp
index 24fd40af6..d61566845 100644
--- a/src/driver/audiodec/ffmpegdec.cpp
+++ b/src/driver/audiodec/ffmpegdec.cpp
@@ -52,7 +52,9 @@ extern "C" {
 #define av_frame_free	avcodec_free_frame
 #endif
 
-#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57, 8, 0 ))
+#if (LIBAVCODEC_VERSION_MAJOR > 55)
+#define	av_free_packet av_packet_unref
+#else
 #define av_packet_unref	av_free_packet
 #endif
 
@@ -85,8 +87,10 @@ CFfmpegDec::CFfmpegDec(void)
 	buffer_size = 0x1000;
 	buffer = NULL;
 	avc = NULL;
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
 	avcodec_register_all();
 	av_register_all();
+#endif
 }
 
 CFfmpegDec::~CFfmpegDec(void)
diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index b4fd30f25..5cb772836 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -67,7 +67,9 @@ extern "C" {
 #include <libavformat/avformat.h>
 }
 
-#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57, 8, 0 ))
+#if (LIBAVCODEC_VERSION_MAJOR > 55)
+#define	av_free_packet av_packet_unref
+#else
 #define av_packet_unref	av_free_packet
 #endif
 
@@ -2152,8 +2154,10 @@ bool CStreamRec::Open(CZapitChannel * channel)
 	}
 
 	//av_log_set_level(AV_LOG_VERBOSE);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
 	av_register_all();
 	avcodec_register_all();
+#endif
 	avformat_network_init();
 	printf("%s: Open input [%s]....\n", __FUNCTION__, url.c_str());
 
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 884aa993a..94abdccf9 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -60,7 +60,9 @@
 #include <gui/movieplayer.h>
 #include <cs_api.h>
 
-#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57, 8, 0 ))
+#if (LIBAVCODEC_VERSION_MAJOR > 55)
+#define	av_free_packet av_packet_unref
+#else
 #define av_packet_unref	av_free_packet
 #endif
 
@@ -795,8 +797,10 @@ bool CStreamStream::Open()
 	}
 
 	//av_log_set_level(AV_LOG_VERBOSE);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
 	av_register_all();
 	avcodec_register_all();
+#endif
 	avformat_network_init();
 
 	printf("%s: Open input [%s]....\n", __FUNCTION__, url.c_str());
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 050256be6..f4fbc1d94 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -307,9 +307,10 @@ void CStreamInfo2::probeStreams()
 #ifdef ENABLE_FFMPEG_LOGGING
 		av_log_set_callback(log_callback);
 #endif
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
 		avcodec_register_all();
 		av_register_all();
-
+#endif
 		AVIOContext *avioc = NULL;
 		int buffer_size = 188 * 128;
 		unsigned char *buffer = (unsigned char *) av_malloc(buffer_size);