eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues 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
doc/examples/transcode_aac.c
View File

@@ -20,7 +20,7 @@
* @file
* simple audio converter
*
* @example doc/examples/transcode_aac.c
* @example transcode_aac.c
* Convert an input audio file to AAC in an MP4 container using FFmpeg.
* @author Andreas Unterweger (dustsigns@gmail.com)
*/