diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:30:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:30:38 +0200 |
| commit | 74128352047ee3fb075b0f69ab16047f70b45a42 (patch) | |
| tree | 944418d43c9d6c56865bd06f14ad6af46748a443 /libavcodec/version.h | |
| parent | 17d16008befa82cb79e71fbb4dc28fb4d9ec2ce6 (diff) | |
| parent | a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf (diff) | |
| download | ffmpeg-streaming-74128352047ee3fb075b0f69ab16047f70b45a42.zip ffmpeg-streaming-74128352047ee3fb075b0f69ab16047f70b45a42.tar.gz | |
Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'
* commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf':
lavc: make rc_qsquish a private option of mpegvideo encoders
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 91db550..ca8a2c6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -181,5 +181,8 @@ #ifndef FF_API_AVCTX_TIMEBASE #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_MPV_OPT +#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |
