diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 00:51:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 00:51:52 +0400 |
| commit | 07d027b1023de26fa2dba45c281612f0bbb29f0a (patch) | |
| tree | c0883ef53abe545a9af5c652a07b24bffedb563c /intern/ffmpeg | |
| parent | de9dffc61e15a6af41947cbcf09ada89779e86ac (diff) | |
Fix FFMPEG build error with older versions after planar formats commit.
Diffstat (limited to 'intern/ffmpeg')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 69e2e014761..aaedbe2dccd 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -171,6 +171,20 @@ void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp) } #endif +#if ((LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 54 && LIBAVCODEC_VERSION_MINOR < 28)) +static inline +void avcodec_free_frame(AVFrame **frame) +{ + /* don't need to do anything with old AVFrame + * since it does not have malloced members */ + (void)frame; +} +#endif + +#if ((LIBAVCODEC_VERSION_MAJOR > 54) || (LIBAVCODEC_VERSION_MAJOR == 54 && LIBAVCODEC_VERSION_MINOR >= 13)) +#define FFMPEG_HAVE_FRAME_CHANNEL_LAYOUT +#endif + #ifndef FFMPEG_HAVE_AVIO #define AVIO_FLAG_WRITE URL_WRONLY #define avio_open url_fopen |