diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 01:48:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 02:22:01 +0100 |
| commit | 1fc74926a5d13261721e1c9962c48db00d214853 (patch) | |
| tree | 8215350a6b41a26d8d9041e594e6b927ed8e5e40 /.gitignore | |
| parent | 91253839e14cce9793ee93f184cef609ca8195d5 (diff) | |
| parent | b339182eba34f28de5f1a477cdd2c84f1ef35d90 (diff) | |
| download | ffmpeg-1fc74926a5d13261721e1c9962c48db00d214853.tar.gz | |
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
Move all example programs to doc/examples
Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d03a6b9ffd..96ec9a8e11 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ /doc/avoptions_codec.texi /doc/avoptions_format.texi /doc/examples/avio_reading -/doc/examples/decoding_encoding +/doc/examples/avcodec /doc/examples/demuxing_decoding /doc/examples/filtering_audio /doc/examples/filtering_video |