summaryrefslogtreecommitdiff
path: root/libavresample/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-27 12:01:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-27 12:01:23 +0100
commit25b243759cb63621c96f20fe9426a3d067be70bf (patch)
tree1e535335b05392a328b508b3da3aae7e44a84f8e /libavresample/version.h
parente630ca5111077fa8adc972fe8a3d7e2b3e8dc91f (diff)
parentb83d1ee3b41cfe8357836e2582104db2f3364cb0 (diff)
downloadffmpeg-25b243759cb63621c96f20fe9426a3d067be70bf.tar.gz
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 'libavresample/version.h')
-rw-r--r--libavresample/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/version.h b/libavresample/version.h
index 0dd5bb62c5..4495c2f3c7 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -25,7 +25,7 @@
* Libavresample version macros.
*/
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
#define LIBAVRESAMPLE_VERSION_MAJOR 1
#define LIBAVRESAMPLE_VERSION_MINOR 1