Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-30xcbgrab: Validate the capture areaLuca Barbato
And notify why the capture is impossible. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-30xcbgrab: Do not assume the non shm image data is always availableLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-24lavd/v4l2: print buffer flags in case of errorGiorgio Vazzana
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-22dshow: add capture device save and loadMate Sebok
Signed-off-by: Mate Sebok <smfinc.org@gmail.com> Reviewed-by: Roger Pack <rogerdpack2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'Michael Niedermayer
* commit '386e2755aab73ae7075f78d92786cb5c5419597a': jack: Check memory allocation Conflicts: libavdevice/jack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer
* 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>
2015-04-20jack: Check memory allocationFederico Tomassetti
Bug-Id: CID 1265785 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19Replace av_dlog with normal av_log at trace levelVittorio Giovara
This applies to every library where performance is not critical.
2015-04-11libdc1394: Unbreak build after c201069faMichael Kostylev
2015-04-11Merge commit '4f373a5111f900af54301907132942f95276285c'Michael Niedermayer
* commit '4f373a5111f900af54301907132942f95276285c': vfwcap: Unbreak building after c201069fa Conflicts: libavdevice/vfwcap.c See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11vfwcap: Unbreak building after c201069faMartin Storsjö
These headers can't be included in any arbitrary order. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-10avdevice/vfwcap: revert header reordering from ↵Michael Niedermayer
c201069fac9a76e6604f9d84d76a172434d62200 This should fix build on vs2013 Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'Michael Niedermayer
* 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>
2015-04-09avdevice/vfwcap: put the headers back in the order in which they need to beMichael Niedermayer
This avoids build failures Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'Michael Niedermayer
* 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>
2015-04-09avdevice: Apply a more consistent file naming schemeDiego Biurrun
2015-04-09avdevice: Add missing header for NULL_IF_CONFIG_SMALLDiego Biurrun
Also reshuffle headers into canonical order where appropriate.
2015-03-30avdevice/avfoundation: Fix occured typoMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29libavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer APIMatthieu Bouron
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29libavdevice/avfoundation: add capture_mouse_clicks optionMatthieu Bouron
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>
2015-03-29libavdevice/avfoundation: add capture_cursor optionMatthieu Bouron
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>
2015-03-29libavdevice/avfoundation: add framerate and video size optionsMatthieu Bouron
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>
2015-03-12xcbgrab: Check av_strdup() allocationVittorio Giovara
Bug-Id: CID 1274038
2015-03-10lavd/avfoundation: Silence warnings when compiling for iOS.Carl Eugen Hoyos
Reviewed-by: Thilo Borgmann
2015-03-10lavd/avfoundation: Silence c99 warnings when using gcc.Carl Eugen Hoyos
Reviewed-by: Thilo Borgmann
2015-03-10lavd/qtkit: Silence deprecation warnings when using clang.Carl Eugen Hoyos
Reviewed-by: Thilo Borgmann
2015-03-08Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'Michael Niedermayer
* 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>
2015-03-08xcbgrab: Free the host string after checking the connectionLuca Barbato
Prevent an use after free in the error message. Bug-Id: CID 1274040 CC: libav-stable@libav.org
2015-03-06fix spelling errorsAndreas Cadhalpun
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>
2015-03-06lavd/avfoundation: Add support for 24 and 32bit integer input.John Robinson
Tested on Mac Mini soundflower and built-in line input. Reviewed-by: Thilo Borgmann
2015-03-06lavd/avfoundation: Add support for 16bit integer input.Carl Eugen Hoyos
Reviewed-by: Thilo Borgmann
2015-03-02Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'Michael Niedermayer
* commit '619d5e7db88941cadb8136f805564e885c6c6434': v4l2: Use the codec descriptor facility Conflicts: libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-02v4l2: Add support for h264Luca Barbato
2015-03-02v4l2: Use the codec descriptor facilityLuca Barbato
The encoder or decoder might be disabled but the format would be supported for at least remuxing.
2015-03-01Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'Michael Niedermayer
* commit '802987f8c7033ec8b82b35438d3822cf7f761166': x11grab: Unbreak building Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28x11grab: Unbreak buildingChristian Hujer
The correct macro is DEC not D. Broken in b31328d008985f87f0a7c83c700847cef1a4f08c Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-26lavd/alsa: set frame_size field.Nicolas George
The value tells the typical size of a packet from the demuxer.
2015-02-25Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'Michael Niedermayer
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b': xcbgrab: Unbreak parsing filename options Conflicts: libavdevice/xcbgrab.c See: db442c873631065e8719df6da91c016d25501084 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'Michael Niedermayer
* 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>
2015-02-25xcbgrab: Unbreak parsing filename optionsLuca Barbato
CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-25xcbgrab: Provide better names for the y and x optionLuca Barbato
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>
2015-02-16Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'Michael Niedermayer
* commit '81ef46020fa654720e3beb4f5551ba634fae262a': bktr: Use av_strerror and propagate error codes Conflicts: libavdevice/bktr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16bktr: Use av_strerror and propagate error codesHimangi Saraogi
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-02-15Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'Michael Niedermayer
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42': xcbgrab: Correctly make shm optional Conflicts: libavdevice/xcbgrab.c See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15xcbgrab: Correctly make shm optionalLuca Barbato
The segment field in the struct has to be conditionally build as well.
2015-02-15xcbgrab: Use the correct geometry for the region highlightDaniel Moran
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>
2015-02-08avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08avdevice/decklink_common: Fix Decklink for MacGeorg Lippitsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08avdevice/decklink: 10 Bit support for Decklink input deviceGeorg Lippitsch
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>
2015-01-31lavd/libcdio: add more paranoia mode constantsStefano Sabatini