diff --git a/veejay-current/veejay-server/libel/av.h b/veejay-current/veejay-server/libel/av.h index 252b1a7f..8f1652ed 100755 --- a/veejay-current/veejay-server/libel/av.h +++ b/veejay-current/veejay-server/libel/av.h @@ -23,6 +23,8 @@ #define FF_VJE_BACKPORT (LIBAVCODEC_VERSION_MAJOR >= 56 && LIBAVCODEC_VERSION_MINOR >= 1) +#define FF_NO_VIDEO_ENCODE (LIBAVCODEC_VERSION_MICRO > 0 && LIBAVCODEC_VERSION_MAJOR >= 56) + #if FF_VJE_BACKPORT #ifndef CODEC_ID_MJPEGB diff --git a/veejay-current/veejay-server/libel/vj-avcodec.c b/veejay-current/veejay-server/libel/vj-avcodec.c index b6903019..4b0956fd 100644 --- a/veejay-current/veejay-server/libel/vj-avcodec.c +++ b/veejay-current/veejay-server/libel/vj-avcodec.c @@ -33,7 +33,6 @@ #endif #include #include -#include #include #include #ifdef STRICT_CHECKING @@ -587,7 +586,7 @@ static int vj_avcodec_copy_frame( vj_encoder *av, uint8_t *src[3], uint8_t *dst return 0; } -#if FF_VJE_BACKPORT +#if FF_NO_VIDEO_ENCODE static int avcodec_encode_video( AVCodecContext *ctx, uint8_t *buf, int len, AVFrame *frame) { AVPacket pkt;