Browse code
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>
Timothy Gu authored on 2013/11/29 09:29:41Showing 7 changed files
| ... | ... |
@@ -27,7 +27,6 @@ |
| 27 | 27 |
/ffserver |
| 28 | 28 |
/config.* |
| 29 | 29 |
/coverage.info |
| 30 |
-/version.h |
|
| 31 | 30 |
/doc/*.1 |
| 32 | 31 |
/doc/*.3 |
| 33 | 32 |
/doc/*.html |
| ... | ... |
@@ -53,6 +52,7 @@ |
| 53 | 53 |
/libavcodec/*_tables.c |
| 54 | 54 |
/libavcodec/*_tables.h |
| 55 | 55 |
/libavutil/avconfig.h |
| 56 |
+/libavutil/ffversion.h |
|
| 56 | 57 |
/tests/audiogen |
| 57 | 58 |
/tests/base64 |
| 58 | 59 |
/tests/data/ |
| ... | ... |
@@ -119,8 +119,8 @@ GIT_LOG = $(SRC_PATH)/.git/logs/HEAD |
| 119 | 119 |
.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak |
| 120 | 120 |
.version: M=@ |
| 121 | 121 |
|
| 122 |
-version.h .version: |
|
| 123 |
- $(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION) |
|
| 122 |
+libavutil/ffversion.h .version: |
|
| 123 |
+ $(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION) |
|
| 124 | 124 |
$(Q)touch .version |
| 125 | 125 |
|
| 126 | 126 |
# force version.sh to run whenever version might have changed |
| ... | ... |
@@ -163,7 +163,7 @@ clean:: |
| 163 | 163 |
|
| 164 | 164 |
distclean:: |
| 165 | 165 |
$(RM) $(DISTCLEANSUFFIXES) |
| 166 |
- $(RM) config.* .config libavutil/avconfig.h .version version.h libavcodec/codec_names.h |
|
| 166 |
+ $(RM) config.* .config libavutil/avconfig.h .version libavutil/ffversion.h libavcodec/codec_names.h |
|
| 167 | 167 |
|
| 168 | 168 |
config: |
| 169 | 169 |
$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) |
| ... | ... |
@@ -15,6 +15,10 @@ libavutil: 2012-10-22 |
| 15 | 15 |
|
| 16 | 16 |
API changes, most recent first: |
| 17 | 17 |
|
| 18 |
+2013-11-xx - xxxxxxx - lavu 52.56.100 - ffversion.h |
|
| 19 |
+ Moves version.h to libavutil/ffversion.h. |
|
| 20 |
+ Install ffversion.h and make it public. |
|
| 21 |
+ |
|
| 18 | 22 |
2013-11-xx - xxxxxxx- - lavu 52.19.0 - frame.h |
| 19 | 23 |
Add AV_FRAME_DATA_A53_CC value to the AVFrameSideDataType enum, which |
| 20 | 24 |
identifies ATSC A53 Part 4 Closed Captions data. |