Michael Niedermayer
25b243759c
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>
2013-12-27 12:01:23 +01:00
..
2013-12-16 00:47:39 +01:00
2013-08-29 15:56:03 +02:00
2013-08-30 11:56:11 +02:00
2013-12-16 03:38:13 +01:00
2013-12-05 23:42:07 +01:00
2013-10-06 10:47:09 +02:00
2013-11-19 15:13:48 +01:00
2013-11-19 15:13:48 +01:00
2013-11-19 15:13:48 +01:00
2013-12-16 00:47:39 +01:00
2013-12-16 00:47:39 +01:00
2013-08-29 15:56:03 +02:00
2013-12-14 13:09:30 +01:00
2013-12-05 23:42:07 +01:00
2013-12-24 22:47:49 +01:00
2013-12-27 12:01:23 +01:00
2013-10-17 14:02:43 +02:00