summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2013-11-28 16:29:41 -0800
committerMichael Niedermayer <michaelni@gmx.at>2013-11-30 21:42:55 +0100
commit82b2e9cb1d7e2c24db7d17d0c41bf1cef9a959b3 (patch)
tree9abe2fac34d224c8f6fe97d0028cb661687ac2c2 /.gitignore
parentc5806910918eb9adc3b3a821242cc4bc7647a50f (diff)
downloadffmpeg-streaming-82b2e9cb1d7e2c24db7d17d0c41bf1cef9a959b3.zip
ffmpeg-streaming-82b2e9cb1d7e2c24db7d17d0c41bf1cef9a959b3.tar.gz
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>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 5218666..33c366f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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/
OpenPOWER on IntegriCloud