diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:04:02 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:04:02 +0100 |
| commit | 9f8a942d6ac9c953664341d5bc37b41c1fbab48b (patch) | |
| tree | 3378e4cdbe3287be43cc65de5cd70cf04291fef2 /.gitignore | |
| parent | d1cacbbea946f39fb7a7ff9852bc5d8c1e67143c (diff) | |
| parent | 06edef3d5e072ef3c4face9ce946d2d9c36cc477 (diff) | |
| download | ffmpeg-9f8a942d6ac9c953664341d5bc37b41c1fbab48b.tar.gz | |
Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'
* commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477':
Generate the lists of enabled protocols/bsfs from configure.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f0442e28e7..e8ea178e54 100644 --- a/.gitignore +++ b/.gitignore @@ -58,9 +58,11 @@ /doc/fate.txt /doc/print_options /lcov/ +/libavformat/protocol_list.c /libavcodec/*_tablegen /libavcodec/*_tables.c /libavcodec/*_tables.h +/libavcodec/bsf_list.c /libavutil/avconfig.h /libavutil/ffversion.h /src |