Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Feb 2014 00:48:42 +0000 (01:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Feb 2014 01:22:01 +0000 (02:22 +0100)
commit1fc74926a5d13261721e1c9962c48db00d214853
tree8215350a6b41a26d8d9041e594e6b927ed8e5e40
parent91253839e14cce9793ee93f184cef609ca8195d5
parentb339182eba34f28de5f1a477cdd2c84f1ef35d90
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>
.gitignore
common.mak
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/Makefile
doc/examples/avcodec.c
doc/examples/transcode_aac.c
libavformat/Makefile
library.mak