eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-17 21:30:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec_encode_video in libav libavcodec 56.11.0 but not in ffmpeg libavcodec 56.13.100

Browse Source
This commit is contained in:
niels
2015-01-26 22:21:46 +01:00
parent 3a341c8194
commit ddd09b064d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veejay-current/veejay-server/libel/av.h
View File

@@ -23,6 +23,8 @@
#define FF_VJE_BACKPORT (LIBAVCODEC_VERSION_MAJOR >= 56 && LIBAVCODEC_VERSION_MINOR >= 1) #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 #if FF_VJE_BACKPORT
#ifndef CODEC_ID_MJPEGB #ifndef CODEC_ID_MJPEGB

3
veejay-current/veejay-server/libel/vj-avcodec.c
View File

@@ -33,7 +33,6 @@
#endif #endif
#include <libavutil/avutil.h> #include <libavutil/avutil.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavcodec/version.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libel/av.h> #include <libel/av.h>
#ifdef STRICT_CHECKING #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; 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) static int avcodec_encode_video( AVCodecContext *ctx, uint8_t *buf, int len, AVFrame *frame)
{ {
AVPacket pkt; AVPacket pkt;