generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
70,581 Commits 24 Branches 241 Tags 173 MiB
399e31419a
Commit Graph

1067 Commits

Author SHA1 Message Date
Michael Niedermayer
3360c6ac0c Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8' 
* 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-08 19:44:09 +01:00
Luca Barbato
5f5b78aca3 xcbgrab: Free the host string after checking the connection 
Prevent an use after free in the error message.

Bug-Id: CID 1274040
CC: libav-stable@libav.org
 2015-03-08 14:39:01 +01:00
Andreas Cadhalpun
482c86f231 fix spelling errors 
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-06 21:35:00 +01:00
John Robinson
98d19ca8f1 lavd/avfoundation: Add support for 24 and 32bit integer input. 
Tested on Mac Mini soundflower and built-in line input.

Reviewed-by: Thilo Borgmann
 2015-03-06 01:10:16 +01:00
Carl Eugen Hoyos
23e483269d lavd/avfoundation: Add support for 16bit integer input. 
Reviewed-by: Thilo Borgmann
 2015-03-06 01:06:57 +01:00
Michael Niedermayer
cde6e328de Merge commit '619d5e7db88941cadb8136f805564e885c6c6434' 
* commit '619d5e7db88941cadb8136f805564e885c6c6434':
  v4l2: Use the codec descriptor facility

Conflicts:
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-02 20:16:22 +01:00
Luca Barbato
9a26ba9713 v4l2: Add support for h264 2015-03-02 12:07:59 +01:00
Luca Barbato
619d5e7db8 v4l2: Use the codec descriptor facility 
The encoder or decoder might be disabled but the format would be
supported for at least remuxing.
 2015-03-02 11:27:57 +01:00
Michael Niedermayer
8a77672645 Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166' 
* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
  x11grab: Unbreak building

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-01 00:17:36 +01:00
Christian Hujer
802987f8c7 x11grab: Unbreak building 
The correct macro is DEC not D. Broken in
b31328d008

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-02-28 21:51:24 +01:00
Nicolas George
a92193f247 lavd/alsa: set frame_size field. 
The value tells the typical size of a packet from the demuxer.
 2015-02-26 19:19:56 +01:00
Michael Niedermayer
a1b5cf0181 Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b' 
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b':
  xcbgrab: Unbreak parsing filename options

Conflicts:
	libavdevice/xcbgrab.c

See: db442c8736
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-25 01:44:49 +01:00
Michael Niedermayer
2fbdf30efe Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c' 
* 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-25 01:12:50 +01:00
Luca Barbato
85b3b1c4ba xcbgrab: Unbreak parsing filename options 
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-24 22:31:20 +01:00
Luca Barbato
b31328d008 xcbgrab: Provide better names for the y and x option 
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-24 22:31:20 +01:00
Michael Niedermayer
e97a9666ef Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a' 
* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
  bktr: Use av_strerror and propagate error codes

Conflicts:
	libavdevice/bktr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 02:56:17 +01:00
Himangi Saraogi
81ef46020f bktr: Use av_strerror and propagate error codes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2015-02-15 13:42:31 -08:00
Michael Niedermayer
3171ac209b Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42' 
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
	libavdevice/xcbgrab.c

See: 8c0ae9015a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:42:52 +01:00
Luca Barbato
d40815a982 xcbgrab: Correctly make shm optional 
The segment field in the struct has to be conditionally build
as well.
 2015-02-15 18:20:54 +01:00
Daniel Moran
51ca3cb604 xcbgrab: Use the correct geometry for the region highlight 
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-15 18:20:54 +01:00
Michael Niedermayer
5ae140c04f avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 04:52:52 +01:00
Georg Lippitsch
62ea5ae2b5 avdevice/decklink_common: Fix Decklink for Mac 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 04:43:54 +01:00
Georg Lippitsch
97a27065c8 avdevice/decklink: 10 Bit support for Decklink input device 
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-02-08 04:31:27 +01:00
Stefano Sabatini
c8bec255ef lavd/libcdio: add more paranoia mode constants 2015-01-31 11:32:05 +01:00
Stefano Sabatini
fbccbd6832 lavd/libcdio: apply minor fixes to options documentation 2015-01-31 11:32:05 +01:00
Michael Niedermayer
37984ca133 Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff' 
* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 20:29:29 +01:00
Clay McClure
6a808f5ae1 libdc1394: Add support for MONO8 (gray) video mode 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-01-28 16:10:24 +01:00
rogerdpack
61974c7dcc dshow: tweak logging 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 02:04:30 -07:00
rogerdpack
7c2e262701 dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 01:29:58 -07:00
rogerdpack
c55fa2f09b dshow: add properties dialog for tv tuners 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 00:28:26 -07:00
Michael Niedermayer
15848c623d avdevice/dshow_crossbar: Avoid mixing declarations and statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-24 18:44:40 +01:00
rogerdpack
a35da0920d dshow: some devices only list themselves under "Video sources" but 
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>
 2015-01-23 06:54:48 -07:00
rogerdpack
5d72cf0f64 dshow: add options for allowing filter popup configuration dialogs to be presented to the user 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:49:37 -07:00
rogerdpack
ec81ad21c1 dshow: introduce support for crossbar [multiple input selectable] devices 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:35:16 -07:00
rogerdpack
b76a0e24f9 dshow: drop initial audio packets with weird timestamps 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:13:33 -07:00
rogerdpack
8eb5b5ec6f dshow: use non deprecated api 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:07:24 -07:00
rogerdpack
e620eee88c dshow: miscellaneous tweaks 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:01:32 -07:00
rogerdpack
d01234419b dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 05:38:14 -07:00
Michael Niedermayer
48895a23fc avdevice/alsa-audio-common: Use *alloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-20 17:00:16 +01:00
Michael Niedermayer
bf8bcd3b2b avdevice/openal-dec: Check the return code of av_new_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-19 00:34:18 +01:00
Clément Bœsch
fa6c9e54df avdevice/pulse_audio_dec: remove double ;; 2015-01-18 00:35:04 +01:00
Michael Niedermayer
ba97cf2c45 avdevice: Use av_format_get_control_message_cb() 
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>
 2015-01-16 02:13:01 +01:00
Lukasz Marek
ea0ac11f1b lavd/v4l2: implement list device callback 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-01-11 18:58:33 +01:00
Lukasz Marek
007c33df0a lavd/avdevice: introduce helper functions for sink/sources listing 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-01-11 18:58:26 +01:00
Lukasz Marek
9241e544ff lavd/avdevice: remove av_ prefix from private function 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-01-11 18:54:49 +01:00
Michael Niedermayer
e5993aeb60 avdevice/lavfi: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:11:44 +01:00
Nicolas George
55763b6f5e lavd/lavfi: allow to extract subcc. 
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 20:17:05 +01:00
Michael Niedermayer
9c3a8693a2 avdevice/dshow: Remove unneeded NULL checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 18:17:12 +01:00
Michael Niedermayer
a3f6e8c4d9 avdevice/dshow: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 18:16:37 +01:00
Michael Niedermayer
beaea2de61 avdevice/dv1394: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 18:16:02 +01:00