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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-10Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'Michael Niedermayer
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33': xcbgrab: Support empty filename string correctly Conflicts: libavdevice/xcbgrab.c See: 62eca2f827d441f52125191fd78c96b67a7ba30c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10xcbgrab: Support empty filename string correctlyLuca Barbato
Bug-Id: CID 1254664 CC: libav-stable@libav.org
2014-12-09avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before useMichael Niedermayer
Fixes CID1254668 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-08Fix xcb 32bit pix_fmts: There is no screen transparency.Carl Eugen Hoyos
2014-12-07avdevice/xcbgrab: Fix show_region rectangleDaniel Moran
Fixes trac ticket #4164 This is to address an error when using show_region, which would cause part of the captured area to become static. It looks like the rectangle specifying the capture area was relative to the capture window. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04Fix standalone compilation of the iec61883 input device.Carl Eugen Hoyos
2014-12-03avdevice/decklink_common: fix COM initialization failure checkJonathan Baecker
Signed-off-by: Jonathan Baecker <jonbae77@gmail.com> Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03avdevice/decklink_common: fix heap corruption run time errorJonathan Baecker
Signed-off-by: Jonathan Baecker <jonbae77@gmail.com> Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28fix Makefile objects for pulseaudio supportMichael Stypa
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-27msvc: Fix compilation errors due to header include order.Matthew Oliver
Ensures that the header include order is such that winsock2.h is always included before windows.h or that windows.h does not include winsock.h. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25avdevice/decklink_common: Fix "Cross-compiling FFmpeg on Debian for Windows ↵Carl Eugen Hoyos
with MinGW-w64" Fixes Ticket4130 Requested and Tested by: Zeranoe Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25avdevice/dshow: fix build, ensure that feature enable #defines are set ↵Michael Niedermayer
before includes dshow_capture.h sets up various flags before including windows headers this must occur before other headers (like os_support.h) include these headers without the setup This could be fixed differently but for now this fixes building on mingw Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24avdevice/xcbgrab: fix undefined reference to xcb_shape_rectangles in xcbgrab.cBoris Reisig
works with (--enable-libxcb-shape) and without (--disable-libxcb-shape) now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-22avdevice/iec61883: Use av_freep(), avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21avdevice/avdevice.c: Use av_freep(), avoid leaving stale pointersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21avdevice/fbdev_common: Use av_freep(), avoid leaving stale pointersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21avdevice/pulse_audio_common: Use av_freep(), avoid leaving stale pointersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18avdevice/oss_audio: avoid strerror() and errbufMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-16avdevice/xcbgrab: Fix/remove unneeded NULL checksMichael Niedermayer
Fixes CID1254664 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14lavd/avfoundation: Introduce device alias 'none' to allow the user to record ↵Thilo Borgmann
only audio or video. Changes the selection of a default device to none instead of the system default device. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12lavd/avfoundation: Remove unused -frame_rate option.Carl Eugen Hoyos
2014-11-11v4l2: Unify one instance of reading/storing errnoMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-10lavd/avfoundation: Use internal av_strtok instead of std lib strtokThilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10Merge commit '09f25533a564eab743f258d168697a11122914c4'Michael Niedermayer
* commit '09f25533a564eab743f258d168697a11122914c4': v4l2: Preserve errno values Conflicts: libavdevice/v4l2.c See: 60950adc18fe145a235211e75da68ab07123fcaa Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'Michael Niedermayer
* commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478': v4l2: Use av_strerror Conflicts: libavdevice/v4l2.c See: 60950adc18fe145a235211e75da68ab07123fcaa Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09v4l2: Preserve errno valuesLuca Barbato
av_log usually resets it.
2014-11-09v4l2: Use av_strerrorTristan Matthews
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-11-08Revert "v4l2: setting device parameters early"Michael Niedermayer
This reverts commit b1ad9312331759679a9c956233716a67ae681d89. Fixes Ticket #3517 Conflicts: libavdevice/v4l2.c Requested-by: Giorgio Vazzana <mywing81@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06lavd/v4l2: use pixel format variable names consistentlyGiorgio Vazzana
We now use 'pixelformat' for V4L2_PIX_FMT_* (as they do in v4l2 documentation) and 'pix_fmt' for AVPixelFormat. No functional change in the code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05v4l2: support MPEG4 compressed streamsAndrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01lavd/alsa: implement get_device_list callbacksLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-30avdevice/xcbgrab: Fix offset supportMichael Niedermayer
Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-30Fix compilation of xcbgrab if xcb/shape.h is not available.Carl Eugen Hoyos
Old versions of libxcb do not provide xcb_shape_rectangles(). The issue can be fixed differently but this small change fixes some fate platforms and a user reported compilation problem. Reported and tested by trac user kevmitch. Fixes ticket #4067.
2014-10-30Fix xcbgrab build if shm is not available.Carl Eugen Hoyos
2014-10-29Merge commit '2cd28693a59050717cb7da6cb229e606b1dee356'Michael Niedermayer
* commit '2cd28693a59050717cb7da6cb229e606b1dee356': jack: Use av_strerror Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29avdevice/fbdev_dec: use errno instead of ret for av_logMichael Niedermayer
Should fix printing the wrong value Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'Michael Niedermayer
* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e': fbdev: Use av_strerror Conflicts: libavdevice/fbdev_dec.c See: f6b56b1f26a1e40a47d85d24b42cd5475cd3b04f Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29jack: Use av_strerrorLuca Barbato
2014-10-29fbdev: Use av_strerrorLuca Barbato
2014-10-29lavd/v4l2: don't use avpriv_ prefix for internal functionsJames Almer
No need to keep the old symbols around until a major bump since lavd functions with the avpriv_ prefix were never exposed. Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29Use v4l2 input format automatically if filename starts with "/dev/video"Andrey Utkin
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2014-10-28avdevice/xcbgrab: set avclass categoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28lavd: fix building x11grab after a6674d2Anton Khirnov
2014-10-27Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'Michael Niedermayer
* commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96': xcbgrab: XCB-based screen capture Conflicts: Changelog configure libavdevice/Makefile libavdevice/alldevices.c libavdevice/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-27lavd/avfoundation: Fix compilation for non MAC OS devices by conditional ↵Thilo Borgmann
compilation of screen capture capabilities. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26xcbgrab: XCB-based screen captureLuca Barbato
Matches the x11grab screen capture by features.
2014-10-26lavd/avfoundation: Add support for screen capturing.Thilo Borgmann
Patch based on pull-request by Joseph Benden <joe@benden.us> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25avdeviece: Read errno before av_log() as the callback from av_log() might ↵Michael Niedermayer
affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22lavd/fbdev_common: report error during probing fbdev deviceLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-22lavd/fbdev_dec: use default device when not providedLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>