diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:20:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:22:48 +0200 |
| commit | e15e78f391abf4e037352cd783f6fa3c6b843d94 (patch) | |
| tree | bc2b1e5e48a071f56f1cdcc4e40cfc11ded77d53 /.gitignore | |
| parent | 2778fdbe5424485d135a37d384d6449113a6c2b5 (diff) | |
| parent | 1316df7aa98c4784f190d107206d0bb12c590b89 (diff) | |
| download | ffmpeg-e15e78f391abf4e037352cd783f6fa3c6b843d94.tar.gz | |
Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'
* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
lavu: add an API function to return the Libav version string
Conflicts:
.gitignore
Makefile
cmdutils.c
doc/APIchanges
libavutil/avutil.h
libavutil/utils.c
See: f91126643a91c2d3f8d8e210c8facaf259951b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 71d4d647e9..34e43799c8 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ /ffserver /config.* /coverage.info +/avversion.h /doc/*.1 /doc/*.3 /doc/*.html |