diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 14:31:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 14:33:22 +0100 |
| commit | d808dce4a98f86be210d334185cacb662fbb20c2 (patch) | |
| tree | e300709a85dea5afbec0808712238496323bd472 | |
| parent | 3f461566b707b4bdae80281812e80dc25f3dbc9e (diff) | |
| parent | 294a51e18ab7df4d658249361a03f0d716a4e9f0 (diff) | |
| download | ffmpeg-streaming-d808dce4a98f86be210d334185cacb662fbb20c2.zip ffmpeg-streaming-d808dce4a98f86be210d334185cacb662fbb20c2.tar.gz | |
Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0'
* commit '294a51e18ab7df4d658249361a03f0d716a4e9f0':
gitignore: Add all examples below doc/examples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -34,6 +34,7 @@ /doc/config.texi /doc/avoptions_codec.texi /doc/avoptions_format.texi +/doc/doxy/html/ /doc/examples/avio_reading /doc/examples/avcodec /doc/examples/demuxing_decoding @@ -47,9 +48,6 @@ /doc/examples/scaling_video /doc/examples/transcode_aac /doc/fate.txt -/doc/doxy/html/ -/doc/examples/output -/doc/examples/transcode_aac /doc/print_options /lcov/ /libavcodec/*_tablegen |
