diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 13:19:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 13:19:00 +0100 |
| commit | 76f8d3c8d9211daca678747e9521c7ed9e90aba9 (patch) | |
| tree | eb69348de94a6b7133c440740fe33ad21dc0640d /libavutil/version.h | |
| parent | fb4b1607561c167b5018641829387447cc8fb51d (diff) | |
| parent | 9d4da474f5f40b019cb4cb931c8499deee586174 (diff) | |
| download | ffmpeg-streaming-76f8d3c8d9211daca678747e9521c7ed9e90aba9.zip ffmpeg-streaming-76f8d3c8d9211daca678747e9521c7ed9e90aba9.tar.gz | |
Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
lls: move to the private namespace
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 5aca91d..cf65fff 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -129,6 +129,10 @@ #ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO #define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 53) #endif +#ifndef FF_API_LLS_PRIVATE +#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 53) +#endif + /** * @} |
