Michael Niedermayer 1fc74926a5 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>

2014-02-17 02:22:01 +01:00

167 B

Executable File

Raw Blame History

View Raw