diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:18:04 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:18:04 +0000 |
| commit | 2e9b995e4f7f6457a36331e66fb78a5676cd9b25 (patch) | |
| tree | 1134c54348410c273ee9bf04101445ffbbc7cc39 /libavcodec/version.h | |
| parent | 11e6f13a13302dae18a1a83dac72fd9df0a69139 (diff) | |
| parent | 0e6c8532215790bbe560a9eea4f3cc82bb55cf92 (diff) | |
| download | ffmpeg-streaming-2e9b995e4f7f6457a36331e66fb78a5676cd9b25.zip ffmpeg-streaming-2e9b995e4f7f6457a36331e66fb78a5676cd9b25.tar.gz | |
Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
lavc: Move b_frame_strategy and b_sensitivity to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 61b3c54..4962c50 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -208,5 +208,8 @@ #ifndef FF_API_STAT_BITS #define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_PRIVATE_OPT +#define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |
