RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0' 

* commit '294a51e18ab7df4d658249361a03f0d716a4e9f0':
  gitignore: Add all examples below doc/examples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-19 14:31:26 +01:00
parent 3f461566b7 294a51e18a
commit d808dce4a9
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -34,6 +34,7 @@
/doc/config.texi /doc/config.texi
/doc/avoptions_codec.texi /doc/avoptions_codec.texi
/doc/avoptions_format.texi /doc/avoptions_format.texi
/doc/doxy/html/
/doc/examples/avio_reading /doc/examples/avio_reading
/doc/examples/avcodec /doc/examples/avcodec
/doc/examples/demuxing_decoding /doc/examples/demuxing_decoding
@ -47,9 +48,6 @@
/doc/examples/scaling_video /doc/examples/scaling_video
/doc/examples/transcode_aac /doc/examples/transcode_aac
/doc/fate.txt /doc/fate.txt
/doc/doxy/html/
/doc/examples/output
/doc/examples/transcode_aac
/doc/print_options /doc/print_options
/lcov/ /lcov/
/libavcodec/*_tablegen /libavcodec/*_tablegen