highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'

Browse Source 
* 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: 183117fed7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-27 12:01:23 +01:00
parent e630ca5111 b83d1ee3b4
commit 25b243759c
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavresample/version.h
View File

@@ -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