virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
115,530 Commits 37 Branches 400 Tags 463 MiB
24d3291f7c
Commit Graph

163 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
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +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
1a204f0760 framebuffer device demuxer 2011-03-08 17:33:23 +01:00
Stefano Sabatini
8621a37d9f In video4linux2, in the case the timebase value in ap is 0/0, read the 
timebase value already set in the driver, and set it back in the codec
stream, rather than leaving the invalid value of 0/0.

In particular, fix ffmpeg grabbing timestamps when the timebase value
is not set through the CLI.

Originally committed as revision 26224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 14:15:11 +00:00
Ramiro Polla
fbd4a07db1 doc: fill documentation for vfwcap 
Originally committed as revision 25553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 02:12:04 +00:00
Stefano Sabatini
52c553302a Fix VfW spelling. 
Originally committed as revision 24738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 21:06:43 +00: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
c32ccf7c43 Rename the chapter Devices -> Input Devices, as the file is about 
input devices.

Originally committed as revision 24723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 23:15:23 +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