summaryrefslogtreecommitdiffstats
path: root/libavdevice
Commit message (Collapse)AuthorAgeFilesLines
* avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()Michael Niedermayer2015-05-071-5/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/xcbgrab: fix comparison with screen size.Nicolas George2015-05-061-2/+2
| | | | | Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'Michael Niedermayer2015-04-301-2/+11
|\ | | | | | | | | | | | | * commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641': xcbgrab: Validate the capture area Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Validate the capture areaLuca Barbato2015-04-301-2/+11
| | | | | | | | | | | | And notify why the capture is impossible. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'Michael Niedermayer2015-04-301-2/+14
|\ \ | |/ | | | | | | | | | | * commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b': xcbgrab: Do not assume the non shm image data is always available Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Do not assume the non shm image data is always availableLuca Barbato2015-04-301-2/+14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavd/v4l2: print buffer flags in case of errorGiorgio Vazzana2015-04-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dshow: add capture device save and loadMate Sebok2015-04-222-3/+98
| | | | | | | | | | | | Signed-off-by: Mate Sebok <smfinc.org@gmail.com> Reviewed-by: Roger Pack <rogerdpack2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'Michael Niedermayer2015-04-201-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '386e2755aab73ae7075f78d92786cb5c5419597a': jack: Check memory allocation Conflicts: libavdevice/jack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jack: Check memory allocationFederico Tomassetti2015-04-191-0/+2
| | | | | | | | | | Bug-Id: CID 1265785 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-202-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-192-3/+3
| | | | | | | | This applies to every library where performance is not critical.
| * libdc1394: Unbreak build after c201069faMichael Kostylev2015-04-111-10/+10
| |
* | Merge commit '4f373a5111f900af54301907132942f95276285c'Michael Niedermayer2015-04-111-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '4f373a5111f900af54301907132942f95276285c': vfwcap: Unbreak building after c201069fa Conflicts: libavdevice/vfwcap.c See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vfwcap: Unbreak building after c201069faMartin Storsjö2015-04-111-3/+6
| | | | | | | | | | | | These headers can't be included in any arbitrary order. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avdevice/vfwcap: revert header reordering from ↵Michael Niedermayer2015-04-101-3/+3
| | | | | | | | | | | | | | | | | | c201069fac9a76e6604f9d84d76a172434d62200 This should fix build on vs2013 Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'Michael Niedermayer2015-04-0914-30/+28
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d26c193fb42d08602ac93ece039d4718d029adc': avdevice: Apply a more consistent file naming scheme Conflicts: libavdevice/Makefile libavdevice/alsa.h libavdevice/alsa_dec.c libavdevice/alsa_enc.c libavdevice/sndio_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avdevice: Apply a more consistent file naming schemeDiego Biurrun2015-04-0914-29/+27
| |
* | avdevice/vfwcap: put the headers back in the order in which they need to beMichael Niedermayer2015-04-091-1/+1
| | | | | | | | | | | | This avoids build failures Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'Michael Niedermayer2015-04-0910-21/+45
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c201069fac9a76e6604f9d84d76a172434d62200': avdevice: Add missing header for NULL_IF_CONFIG_SMALL Conflicts: libavdevice/alsa-audio-dec.c libavdevice/alsa-audio-enc.c libavdevice/pulse_audio_dec.c libavdevice/sndio_enc.c libavdevice/vfwcap.c libavdevice/x11grab.c libavdevice/xcbgrab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avdevice: Add missing header for NULL_IF_CONFIG_SMALLDiego Biurrun2015-04-0910-19/+40
| | | | | | | | Also reshuffle headers into canonical order where appropriate.
| * xcbgrab: Check av_strdup() allocationVittorio Giovara2015-03-121-0/+2
| | | | | | | | Bug-Id: CID 1274038
* | 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.
OpenPOWER on IntegriCloud