Age | Commit message (Collapse) | Author |
|
Reviewed-by: Thilo Borgmann
|
|
Reviewed-by: Thilo Borgmann
|
|
Reviewed-by: Thilo Borgmann
|
|
* 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>
|
|
Prevent an use after free in the error message.
Bug-Id: CID 1274040
CC: libav-stable@libav.org
|
|
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>
|
|
Tested on Mac Mini soundflower and built-in line input.
Reviewed-by: Thilo Borgmann
|
|
Reviewed-by: Thilo Borgmann
|
|
* commit '619d5e7db88941cadb8136f805564e885c6c6434':
v4l2: Use the codec descriptor facility
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
The encoder or decoder might be disabled but the format would be
supported for at least remuxing.
|
|
* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
x11grab: Unbreak building
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
The correct macro is DEC not D. Broken in
b31328d008985f87f0a7c83c700847cef1a4f08c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
|
|
The value tells the typical size of a packet from the demuxer.
|
|
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b':
xcbgrab: Unbreak parsing filename options
Conflicts:
libavdevice/xcbgrab.c
See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* 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>
|
|
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
|
|
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>
|
|
* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
bktr: Use av_strerror and propagate error codes
Conflicts:
libavdevice/bktr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
|
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
xcbgrab: Correctly make shm optional
Conflicts:
libavdevice/xcbgrab.c
See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
The segment field in the struct has to be conditionally build
as well.
|
|
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>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
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>
|
|
|
|
|
|
* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
libdc1394: Add support for MONO8 (gray) video mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
|
|
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
so it can be just once
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
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>
|
|
presented to the user
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
devices with symbols in them), allow specifying capture pins by name and alternative (unique) name
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
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>
|
|
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
|
|
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
|
|
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|