diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 18:18:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 18:19:06 +0100 |
| commit | 066dbfe1655b484281fda10a4433cbd82765217d (patch) | |
| tree | 657143fb6d458a0051db938f62352aae95501160 | |
| parent | 6a71efff33e74d2c0ca73684ffb5dc3f58841f51 (diff) | |
| parent | 6f1ec8edf2416441e2348f3a0915c9fee179d7da (diff) | |
| download | ffmpeg-066dbfe1655b484281fda10a4433cbd82765217d.tar.gz | |
Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'
* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
avcodec.h: include version.h before using version macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 90abdb2e6f..48114d988b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -37,15 +37,16 @@ #include "libavutil/dict.h" #include "libavutil/frame.h" #include "libavutil/log.h" -#if FF_API_FAST_MALLOC -// to provide fast_*alloc -#include "libavutil/mem.h" -#endif #include "libavutil/pixfmt.h" #include "libavutil/rational.h" #include "version.h" +#if FF_API_FAST_MALLOC +// to provide fast_*alloc +#include "libavutil/mem.h" +#endif + /** * @defgroup libavc Encoding/Decoding Library * @{ |