ffmpeg: handle some API changes for release/4.0 master

closes #534

Change-Id: I02ca8e2e3cbe6193705b34f6f2df09205b283022

lib/codeclib.c

@@ -695,8 +695,10 @@ static void avc_def_init(codec_def_t *def) {
 }
 
 void codeclib_init(int print) {
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
 	av_register_all();
 	avcodec_register_all();
+#endif
 	avfilter_register_all();
 	avformat_network_init();
 	av_log_set_callback(avlog_ilog);

lib/fix_frame_channel_layout-01.h

@@ -3,7 +3,16 @@
 #include "compat.h"
 
 INLINE void fix_frame_channel_layout(AVFrame *frame) {
-	if (frame->channel_layout)
+	if (frame->channel_layout) {
+#if LIBAVUTIL_VERSION_MAJOR < 56
+		if (!frame->channels)
+			frame->channels = av_frame_get_channels(frame);
+#endif
 		return;
+	}
+#if LIBAVUTIL_VERSION_MAJOR < 56
 	frame->channel_layout = av_get_default_channel_layout(av_frame_get_channels(frame));
+#else
+	frame->channel_layout = av_get_default_channel_layout(frame->channels);
+#endif
 }

lib/fix_frame_channel_layout-02.h

@@ -3,7 +3,10 @@
 #include "compat.h"
 
 INLINE void fix_frame_channel_layout(AVFrame *frame) {
-	if (frame->channel_layout)
+	if (frame->channel_layout) {
+		if (!frame->channels)
+			frame->channels = av_frame_get_channels(frame);
 		return;
+	}
 	frame->channel_layout = av_get_default_channel_layout(frame->channels);
 }

lib/fix_frame_channel_layout-03.h

@@ -0,0 +1,9 @@
+#include <libavutil/frame.h>
+#include <libavutil/channel_layout.h>
+#include "compat.h"
+
+INLINE void fix_frame_channel_layout(AVFrame *frame) {
+	if (frame->channel_layout)
+		return;
+	frame->channel_layout = av_get_default_channel_layout(av_frame_get_channels(frame));
+}

lib/fix_frame_channel_layout-04.h

@@ -0,0 +1,9 @@
+#include <libavutil/frame.h>
+#include <libavutil/channel_layout.h>
+#include "compat.h"
+
+INLINE void fix_frame_channel_layout(AVFrame *frame) {
+	if (frame->channel_layout)
+		return;
+	frame->channel_layout = av_get_default_channel_layout(frame->channels);
+}