diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-01 21:17:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-01 21:18:11 +0100 |
| commit | d4268634155d4aaf4c55cffcf6a2d513ec7670ec (patch) | |
| tree | 4b0d00e4f42b2346339b6f3e3b576283891135ca | |
| parent | 975110a85ef8e794fdc041455ff41b0ad30bc01e (diff) | |
| parent | 3cd612d44789948f72b52944474e0870c5c60964 (diff) | |
| download | ffmpeg-streaming-d4268634155d4aaf4c55cffcf6a2d513ec7670ec.zip ffmpeg-streaming-d4268634155d4aaf4c55cffcf6a2d513ec7670ec.tar.gz | |
Merge commit '3cd612d44789948f72b52944474e0870c5c60964'
* commit '3cd612d44789948f72b52944474e0870c5c60964':
gitignore: Ignore multilibrary example programs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -46,6 +46,8 @@ /doc/examples/transcode_aac /doc/fate.txt /doc/doxy/html/ +/doc/examples/output +/doc/examples/transcode_aac /doc/print_options /lcov/ /libavcodec/*_tablegen |
