diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-27 12:01:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-27 12:01:23 +0100 |
| commit | 25b243759cb63621c96f20fe9426a3d067be70bf (patch) | |
| tree | 1e535335b05392a328b508b3da3aae7e44a84f8e /libavutil | |
| parent | e630ca5111077fa8adc972fe8a3d7e2b3e8dc91f (diff) | |
| parent | b83d1ee3b41cfe8357836e2582104db2f3364cb0 (diff) | |
Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'
* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
avutil: Move library version related macros to version.h
Conflicts:
libavcodec/version.h
libavresample/version.h
libavutil/avutil.h
libavutil/utils.c
See: 183117fed7d0a910b5f65e5c78b065f125abf369
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/utils.c | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/utils.c b/libavutil/utils.c index 4c82503d9c..9453c30ce6 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -17,7 +17,7 @@ */ #include "config.h" -#include "avutil.h" +#include "version.h" #include "avassert.h" #include "samplefmt.h" #include "pixdesc.h" diff --git a/libavutil/version.h b/libavutil/version.h index a70a110662..446e1f208a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -41,6 +41,7 @@ * @} */ + /** * @defgroup version_utils Library Version Macros * @@ -58,7 +59,6 @@ * @} */ - /** * @file * @ingroup lavu |