summaryrefslogtreecommitdiffstats
path: root/libavdevice
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-286-0/+373
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * sndio support for playback and recordBrad2011-03-277-2/+375
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-1917-69/+69
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | ALSA: implement channel layout for playback.Nicolas George2011-03-263-1/+106
| | | | | | | | | | | | | | | | Currently, only S16 quad, 5.1 and 7.1 are implemented. Implementing support for other formats/layouts and capture should be straightforward. 7.1 support by Carl Eugen Hoyos.
* | Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"Michael Niedermayer2011-03-171-1/+1
| | | | | | | | This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
* | Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"Michael Niedermayer2011-03-171-1/+1
| | | | | | | | This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-171-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*Janne Grunau2011-03-161-1/+1
| |
| * replace FFMPEG with LIBAV in FFMPEG_CONFIGURATIONJanne Grunau2011-03-161-1/+1
| | | | | | | | also update the multiple inclusion guards in config.h|mak
| * Merge libavcore into libavutilReinhard Tartler2011-02-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-2612-17/+17
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* | fbdev: fix check on nanosleep return valeStefano Sabatini2011-03-131-1/+1
| | | | | | | | | | | | | | | | | | In fbdev_read_packet(): nanosleep returns -1 in case of errors, the EINTR check has to be done on errno. Spotted by Nicolas. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | framebuffer device demuxerStefano Sabatini2011-03-084-2/+256
| |
* | Merge libavcore into libavutilReinhard Tartler2011-02-163-3/+3
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-2812-17/+17
|/ | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* consolidate .gitignore patters into a single fileJanne Grunau2011-01-181-8/+0
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* convert svn:ignore properties to .gitignore filesJanne Grunau2011-01-171-0/+8
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Factorize common code in v4l2_set_parameters().Stefano Sabatini2011-01-051-14/+7
| | | | Originally committed as revision 26225 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In video4linux2, in the case the timebase value in ap is 0/0, read theStefano Sabatini2011-01-052-1/+14
| | | | | | | | | | 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
* In the video4linux2 output device, log an error description in case ofStefano Sabatini2011-01-041-1/+1
| | | | | | ioctl failure in mmap_release_buffer(). Originally committed as revision 26214 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make x11grab cursor drawing suck lessJason Garrett-Glaser2010-11-071-9/+26
| | | | | | | | | | | | | This new version: 1. Works on 24-bit and 32-bit input, not just 32-bit. 2. Doesn't try to run on 16-bit or 8-bit, instead of outright crashing. 3. Does proper alpha-blending, so cursor shadows look correct. 4. Doesn't swap R and B. Mostly fixes issue 1997. Fixes issue 2056. Originally committed as revision 25690 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vfwcap: add option to print list of supported driversRamiro Polla2010-10-231-0/+16
| | | | Originally committed as revision 25552 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow to set the frame rate in v4l2 devicesJosé Miguel Gonçalves2010-09-231-0/+27
| | | | | | Patch by José Miguel Gonçalves (jose DOT goncalves AT inov DOT pt) Originally committed as revision 25159 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: simplify layout of fmt_conversion_table, make it shorterStefano Sabatini2010-09-121-75/+16
| | | | | | and more readable. Originally committed as revision 25108 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: apply minor style fixes.Stefano Sabatini2010-09-111-14/+14
| | | | Originally committed as revision 25106 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-073-3/+3
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define macro AV_NE() and use it in libavdevice.Stefano Sabatini2010-08-172-10/+2
| | | | | | Help further refactoring. Originally committed as revision 24814 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a mapping for the V4L2_PIX_FMT_NV12 format to PIX_FMT_NV12 forPete Eberlein2010-08-111-0/+5
| | | | | | | video4linux2 devices. This is used by Sensoray Model 2253 cards. Patch by Pete Eberlein (pete AT sensoray DOT com) Originally committed as revision 24759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-064-4/+6
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove non-existing stray arguments from Doxygen function documentation.Diego Biurrun2010-07-021-2/+0
| | | | Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-303-11/+11
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove stray semicolon.Carl Eugen Hoyos2010-06-211-1/+1
| | | | Originally committed as revision 23691 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove broken BeOS audio interface.Diego Biurrun2010-06-103-471/+0
| | | | Originally committed as revision 23568 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make device_open() store the VIDIOC_QUERYCAP ioctl errno, and in caseStefano Sabatini2010-05-011-4/+4
| | | | | | | of failure return the stored value rather than the current errno, which may be overwritten by a following call to close(). Originally committed as revision 23001 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vfwcap: flip RGB rawvideo.Ramiro Polla2010-04-291-1/+7
| | | | Originally committed as revision 22989 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check the return value of device_try_init() immediately after calling such aLuca Abeni2010-04-281-3/+2
| | | | | | | | function. Avoids the following warning: libavdevice/v4l2.c: In function ‘v4l2_read_header’: libavdevice/v4l2.c:586: warning: ‘codec_id’ may be used uninitialized in this function Originally committed as revision 22986 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix weird brace placement.Stefano Sabatini2010-04-271-2/+1
| | | | Originally committed as revision 22982 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reduce the verbosity of the v4l2 input deviceLuca Abeni2010-04-271-3/+3
| | | | Originally committed as revision 22980 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify some output messages in the v4l2 input deviceLuca Abeni2010-04-271-3/+2
| | | | Originally committed as revision 22979 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement v4l2 input size autodetection in v4l2_read_header().Stefano Sabatini2010-04-261-8/+18
| | | | | | | | | Move check on frame size after the device is opened and after device_try_init() is attempted. If the provided size value is 0x0, perform a VIDIOC_G_FMT ioctl() on the device, which sets size to the current settings. Originally committed as revision 22971 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Return meaningful error codes, rather than always -1.Stefano Sabatini2010-04-261-17/+17
| | | | Originally committed as revision 22966 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unnecessary width and height variables from v4l2_read_header().Stefano Sabatini2010-04-251-10/+6
| | | | Originally committed as revision 22963 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-205-5/+5
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace all remaining occurrences of AVERROR_NOMEM withStefano Sabatini2010-04-031-2/+2
| | | | | | | | | AVERROR(ENOMEM). AVERROR_NOMEM is deprecated and will be dropped at the next libavutil major bump. Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace the last occurrance of CODEC_TYPE_ with AVMEDIA_TYPE_Martin Storsjö2010-04-021-1/+1
| | | | Originally committed as revision 22776 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.Jean-Daniel Dupas2010-03-311-1/+1
| | | | | | Patch by Jean-Daniel Dupas, devlists shadowlab org Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-309-9/+9
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make audio_read_packet() return AVERROR_EOF rather than AVERROR(EOF) =Stefano Sabatini2010-03-251-1/+1
| | | | | | AVERROR(-1) = 1. Originally committed as revision 22664 to svn://svn.ffmpeg.org/ffmpeg/trunk
* x11grab: AVFormatParameters are always passed from av_open_input_stream(),Ramiro Polla2010-03-231-1/+1
| | | | | | there is no need to check for it. Originally committed as revision 22651 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert removal of _NETBSD_SOURCE definition.Diego Biurrun2010-03-211-0/+1
| | | | | | It is indeed necessary to compile on NetBSD. Originally committed as revision 22613 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud