1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

7 Commits

Author SHA1 Message Date
Michael Niedermayer
25d8099beb Merge remote-tracking branch 'newdev/master'
* newdev/master:
  ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED:  Remove arrozcru URL from documentation
  sndio support for playback and record

Conflicts:
	doc/faq.texi
	doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-28 01:50:36 +02:00
Brad
15d59d2cea sndio support for playback and record
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-27 10:46:45 +02:00
Michael Niedermayer
a6be21d3ba Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
2011-03-17 17:26:45 +01:00
Janne Grunau
f8a45fa1b1 replace FFmpeg with Libav in doc/
unless it stands for ffmpeg the program or is historic
2011-03-16 22:01:01 +01:00
Stefano Sabatini
63f805fc86 Remove audio_beos entries in indevs.texi and output.devs, BeOS audio
support has been dropped.

Originally committed as revision 24725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 23:15:31 +00:00
Stefano Sabatini
2f6bc4e76e Apply misc fixes spotted by Diego to indevs.texi and outdevs.texi.
Originally committed as revision 24724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 23:15:27 +00:00
Stefano Sabatini
4419c8bf25 Add the indevs.texi and outdevs.texi files.
Originally committed as revision 24543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 13:10:59 +00:00