You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	build: rename version.h to libavutil/ffversion.h
Also the libavutil/ffversion.h will be installed. Rationale: * Applications might want to know FFmpeg's version besides the individual libraries'. * Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when a library source file includes both and is compiled on an out-of-tree build. Fixes #1769. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		
				
					committed by
					
						 Michael Niedermayer
						Michael Niedermayer
					
				
			
			
				
	
			
			
			
						parent
						
							c580691091
						
					
				
				
					commit
					82b2e9cb1d
				
			
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -27,7 +27,6 @@ | ||||
| /ffserver | ||||
| /config.* | ||||
| /coverage.info | ||||
| /version.h | ||||
| /doc/*.1 | ||||
| /doc/*.3 | ||||
| /doc/*.html | ||||
| @@ -53,6 +52,7 @@ | ||||
| /libavcodec/*_tables.c | ||||
| /libavcodec/*_tables.h | ||||
| /libavutil/avconfig.h | ||||
| /libavutil/ffversion.h | ||||
| /tests/audiogen | ||||
| /tests/base64 | ||||
| /tests/data/ | ||||
|   | ||||
							
								
								
									
										6
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								Makefile
									
									
									
									
									
								
							| @@ -119,8 +119,8 @@ GIT_LOG     = $(SRC_PATH)/.git/logs/HEAD | ||||
| .version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak | ||||
| .version: M=@ | ||||
|  | ||||
| version.h .version: | ||||
| 	$(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION) | ||||
| libavutil/ffversion.h .version: | ||||
| 	$(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION) | ||||
| 	$(Q)touch .version | ||||
|  | ||||
| # force version.sh to run whenever version might have changed | ||||
| @@ -163,7 +163,7 @@ clean:: | ||||
|  | ||||
| distclean:: | ||||
| 	$(RM) $(DISTCLEANSUFFIXES) | ||||
| 	$(RM) config.* .config libavutil/avconfig.h .version version.h libavcodec/codec_names.h | ||||
| 	$(RM) config.* .config libavutil/avconfig.h .version libavutil/ffversion.h libavcodec/codec_names.h | ||||
|  | ||||
| config: | ||||
| 	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) | ||||
|   | ||||
| @@ -49,8 +49,8 @@ | ||||
| #include "libavutil/dict.h" | ||||
| #include "libavutil/opt.h" | ||||
| #include "libavutil/cpu.h" | ||||
| #include "libavutil/ffversion.h" | ||||
| #include "cmdutils.h" | ||||
| #include "version.h" | ||||
| #if CONFIG_NETWORK | ||||
| #include "libavformat/network.h" | ||||
| #endif | ||||
|   | ||||
| @@ -15,6 +15,10 @@ libavutil:     2012-10-22 | ||||
|  | ||||
| API changes, most recent first: | ||||
|  | ||||
| 2013-11-xx - xxxxxxx - lavu 52.56.100 - ffversion.h | ||||
|   Moves version.h to libavutil/ffversion.h. | ||||
|   Install ffversion.h and make it public. | ||||
|  | ||||
| 2013-11-xx - xxxxxxx- - lavu 52.19.0 - frame.h | ||||
|   Add AV_FRAME_DATA_A53_CC value to the AVFrameSideDataType enum, which | ||||
|   identifies ATSC A53 Part 4 Closed Captions data. | ||||
|   | ||||
| @@ -24,7 +24,7 @@ | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
| #include "version.h" | ||||
| #include "libavutil/ffversion.h" | ||||
|  | ||||
| #include <string.h> | ||||
|  | ||||
|   | ||||
| @@ -62,7 +62,8 @@ ARCH_HEADERS = bswap.h                                                  \ | ||||
|                intreadwrite.h                                           \ | ||||
|                timer.h                                                  \ | ||||
|  | ||||
| BUILT_HEADERS = avconfig.h | ||||
| BUILT_HEADERS = avconfig.h                                              \ | ||||
|                 ffversion.h | ||||
|  | ||||
| OBJS = adler32.o                                                        \ | ||||
|        aes.o                                                            \ | ||||
|   | ||||
| @@ -75,7 +75,7 @@ | ||||
|  */ | ||||
|  | ||||
| #define LIBAVUTIL_VERSION_MAJOR  52 | ||||
| #define LIBAVUTIL_VERSION_MINOR  55 | ||||
| #define LIBAVUTIL_VERSION_MINOR  56 | ||||
| #define LIBAVUTIL_VERSION_MICRO 100 | ||||
|  | ||||
| #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user