Skip to content

Commit

Permalink
Changes to allow building against the new ffmpeg 4.0 (#1926)
Browse files Browse the repository at this point in the history
  • Loading branch information
lgritz committed Apr 23, 2018
1 parent 19a22ad commit 810a023
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/ffmpeg.imageio/ffmpeginput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
}
#endif


// Changes for ffmpeg 4.0
#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))

#if USE_FFMPEG_4_0
# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
#endif


#include <boost/thread/once.hpp>

#include <OpenImageIO/imageio.h>
Expand Down

0 comments on commit 810a023

Please sign in to comment.