highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-02-17 01:48:42 +01:00
parent 91253839e1 b339182eba
commit 1fc74926a5
10 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -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