aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
Commit message (Collapse)AuthorAgeFilesLines
* avdevice/avfoundation: Fix occured typoMichael Niedermayer2015-03-301-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer APIMatthieu Bouron2015-03-291-6/+15
| | | | | Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavdevice/avfoundation: add capture_mouse_clicks optionMatthieu Bouron2015-03-291-0/+15
| | | | | | | Support mouse clicks capture while recording a screen on OSX >= 10.7. Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavdevice/avfoundation: add capture_cursor optionMatthieu Bouron2015-03-291-0/+19
| | | | | | | | Add support for cursor capturing while recording a screen for OSX >= 10.8. Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavdevice/avfoundation: add framerate and video size optionsMatthieu Bouron2015-03-291-0/+130
| | | | | | | | | | Support framerate ands video size options on AVCaptureDevices for OSX >= 10.7 and iOS >= 7.0. For screen captures, only the framerate option is taken into account. Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/avfoundation: Silence warnings when compiling for iOS.Carl Eugen Hoyos2015-03-101-5/+5
| | | | Reviewed-by: Thilo Borgmann
* lavd/avfoundation: Silence c99 warnings when using gcc.Carl Eugen Hoyos2015-03-101-36/+41
| | | | Reviewed-by: Thilo Borgmann
* lavd/qtkit: Silence deprecation warnings when using clang.Carl Eugen Hoyos2015-03-101-0/+4
| | | | Reviewed-by: Thilo Borgmann
* Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'Michael Niedermayer2015-03-081-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8': xcbgrab: Free the host string after checking the connection Conflicts: libavdevice/xcbgrab.c No change as the bug was not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Free the host string after checking the connectionLuca Barbato2015-03-081-3/+6
| | | | | | | | | | | | | | Prevent an use after free in the error message. Bug-Id: CID 1274040 CC: libav-stable@libav.org
| * v4l2: Add support for h264Luca Barbato2015-03-021-1/+6
| |
* | fix spelling errorsAndreas Cadhalpun2015-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | opttimizations -> optimizations grabing -> grabbing many resource -> many resources isnt -> isn't silcense -> silence Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Add support for 24 and 32bit integer input.John Robinson2015-03-061-0/+10
| | | | | | | | | | | | Tested on Mac Mini soundflower and built-in line input. Reviewed-by: Thilo Borgmann
* | lavd/avfoundation: Add support for 16bit integer input.Carl Eugen Hoyos2015-03-061-0/+6
| | | | | | | | Reviewed-by: Thilo Borgmann
* | Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'Michael Niedermayer2015-03-021-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit '619d5e7db88941cadb8136f805564e885c6c6434': v4l2: Use the codec descriptor facility Conflicts: libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v4l2: Use the codec descriptor facilityLuca Barbato2015-03-021-2/+2
| | | | | | | | | | The encoder or decoder might be disabled but the format would be supported for at least remuxing.
* | Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'Michael Niedermayer2015-03-011-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit '802987f8c7033ec8b82b35438d3822cf7f761166': x11grab: Unbreak building Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Unbreak buildingChristian Hujer2015-02-281-2/+2
| | | | | | | | | | | | | | The correct macro is DEC not D. Broken in b31328d008985f87f0a7c83c700847cef1a4f08c Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavd/alsa: set frame_size field.Nicolas George2015-02-261-0/+1
| | | | | | | | The value tells the typical size of a packet from the demuxer.
* | Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'Michael Niedermayer2015-02-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b': xcbgrab: Unbreak parsing filename options Conflicts: libavdevice/xcbgrab.c See: db442c873631065e8719df6da91c016d25501084 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Unbreak parsing filename optionsLuca Barbato2015-02-241-6/+14
| | | | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'Michael Niedermayer2015-02-252-0/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b31328d008985f87f0a7c83c700847cef1a4f08c': xcbgrab: Provide better names for the y and x option Conflicts: doc/indevs.texi libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Provide better names for the y and x optionLuca Barbato2015-02-242-0/+4
| | | | | | | | | | | | | | | | | | | | Incidentally `-y` also collides with avconv global options. Update x11grab to match and document the option. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'Michael Niedermayer2015-02-161-10/+22
|\| | | | | | | | | | | | | | | | | | | * commit '81ef46020fa654720e3beb4f5551ba634fae262a': bktr: Use av_strerror and propagate error codes Conflicts: libavdevice/bktr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bktr: Use av_strerror and propagate error codesHimangi Saraogi2015-02-151-10/+22
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * xcbgrab: Use the correct geometry for the region highlightDaniel Moran2015-02-151-1/+1
| | | | | | | | | | | | | | The feature is implemented using a transparent window and drawing inside it a rectangle filling the whole window to highlight it. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'Michael Niedermayer2015-02-151-6/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42': xcbgrab: Correctly make shm optional Conflicts: libavdevice/xcbgrab.c See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Correctly make shm optionalLuca Barbato2015-02-151-4/+4
| | | | | | | | | | The segment field in the struct has to be conditionally build as well.
* | avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__Michael Niedermayer2015-02-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/decklink_common: Fix Decklink for MacGeorg Lippitsch2015-02-081-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/decklink: 10 Bit support for Decklink input deviceGeorg Lippitsch2015-02-083-4/+16
| | | | | | | | | | | | | | Example to capture video clip at 1080i50 10 bit: ffmpeg -bm_v210 1 -f decklink -i 'UltraStudio Mini Recorder@11' -acodec copy -vcodec copy output.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/libcdio: add more paranoia mode constantsStefano Sabatini2015-01-311-1/+3
| |
* | lavd/libcdio: apply minor fixes to options documentationStefano Sabatini2015-01-311-5/+5
| |
* | Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'Michael Niedermayer2015-01-281-0/+1
|\| | | | | | | | | | | | | * commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff': libdc1394: Add support for MONO8 (gray) video mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libdc1394: Add support for MONO8 (gray) video modeClay McClure2015-01-281-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | dshow: tweak loggingrogerdpack2015-01-262-5/+11
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: crossbar dialog was frequently being displayed twice, split up option ↵rogerdpack2015-01-263-5/+10
| | | | | | | | | | | | so it can be just once Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: add properties dialog for tv tunersrogerdpack2015-01-263-6/+49
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | avdevice/dshow_crossbar: Avoid mixing declarations and statementsMichael Niedermayer2015-01-241-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dshow: some devices only list themselves under "Video sources" butrogerdpack2015-01-232-36/+50
| | | | | | | | | | | | | | actually have both video and audio output pins, so make the audio pins accessible by video source name. Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: add options for allowing filter popup configuration dialogs to be ↵rogerdpack2015-01-233-1/+69
| | | | | | | | | | | | presented to the user Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: introduce support for crossbar [multiple input selectable] devicesrogerdpack2015-01-234-54/+270
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: drop initial audio packets with weird timestampsrogerdpack2015-01-231-0/+8
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: use non deprecated apirogerdpack2015-01-231-1/+1
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: miscellaneous tweaksrogerdpack2015-01-232-6/+9
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: allow selecting devices by an alternative name (workaround for ↵rogerdpack2015-01-231-12/+76
| | | | | | | | | | | | devices with symbols in them), allow specifying capture pins by name and alternative (unique) name Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | avdevice/alsa-audio-common: Use *alloc_array()Michael Niedermayer2015-01-201-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/openal-dec: Check the return code of av_new_packet()Michael Niedermayer2015-01-191-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/pulse_audio_dec: remove double ;;Clément Bœsch2015-01-181-2/+2
| |
* | avdevice: Use av_format_get_control_message_cb()Michael Niedermayer2015-01-161-2/+2
| | | | | | | | | | | | | | This is required as the location of this field could change and is specified in libavformat not avdevice Signed-off-by: Michael Niedermayer <michaelni@gmx.at>