virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
34,429 Commits 37 Branches 400 Tags 460 MiB
aae7a5e36d
Commit Graph

27 Commits

Author SHA1 Message Date
Michael Niedermayer
8d4e44993a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: remove "legacy" mpegvideo decoder.
  iv8: assemble packets to return complete frames
  pulse: documentation
  pulse: introduce pulseaudio input
  remove the zork pcm seek test

Conflicts:
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c
	libavdevice/avdevice.h
	libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 03:05:16 +02:00
Luca Barbato
c4b97fbdfa pulse: documentation 
Specify avoptions and how to use pactl to list devices.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-10-26 16:39:33 -07:00
Lou Logan
3ac1ade118 docs: remove reference to enable-libavfilter 
This is no longer a valid configure option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-24 17:18:17 +02:00
Stefano Sabatini
4893c204c8 lavdev/lavfi: add audio support 2011-09-16 21:22:05 +02:00
Ramiro Polla
c7807eeb78 doc: add documentation for dshow indev 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:16:00 +02:00
Stefano Sabatini
4ec8685435 indevs.texi: fix typo (builf -> build) 2011-08-11 17:32:54 +02:00
Stefano Sabatini
214357341a lavdev: add libavfilter virtual input device 
This input device is to be considered still experimental, only video
output is supported.
 2011-08-11 17:20:17 +02:00
Anton Khirnov
266463daff Rename ffplay to avplay. 2011-08-09 19:56:21 +02:00
Michael Niedermayer
335bbe424f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
  x11grab: add show_region AVOption.
  x11grab: add follow_mouse AVOption.
  Do not convert RGB buffer at once when stride does not fit exact samples.

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-01 00:35:57 +02:00
Yu-Jie Lin
1442d29533 x11grab: add show_region AVOption. 
Draw the current grabbing region for indication.

Signed-off-by: Yu-Jie Lin <livibetter@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-31 14:26:08 +02:00
Yu-Jie Lin
085791a92e x11grab: add follow_mouse AVOption. 
-follow_mouse centered|PIXELS
  move grabbing region to where mouse pointer at the center; or
  only move when pointer reaches within PIXELS to the edge.

Signed-off-by: Yu-Jie Lin <livibetter@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-31 14:25:00 +02:00
Jonathan Baldwin
65eae2a7a2 lavdev: add openal input device 2011-06-27 15:26:14 +02:00
Michael Niedermayer
59bf303d68 Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
  Chronomaster DFA decoder
DUPLICATE:  framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
  http: header field names are case insensitive

Conflicts:
	LICENSE
	README
	doc/indevs.texi
	libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-29 02:46:11 +02:00
Stefano Sabatini
c6f951442e framebuffer device demuxer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-28 16:49:22 +02:00
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