videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
62,194 Commits 36 Branches 392 Tags 185 MiB
Commit Graph

1075 Commits

Author SHA1 Message Date
Calvin Walton 08909fb56b Add Win32 GDI-based screen grabbing 
Based on original code by Christophe Gisquet in 2010, updated to work
with current ffmpeg APIs.

Supports grabbing a single window or an area of the screen, including
support for multiple monitors (Windows does funky stuff with negative
coordinates here).

I've moved most of the configuration to AVOptions; the input file name
is now only the string "desktop", or "title=<windowname>" to select a
single window. The AVOptions are the same as x11grab where possible.

Code has been added to support a "show_region" mode, like x11grab, which
will draw a rectangle on the screen around the area being captured.

Instead of duplicating code for paletted image handling, I make use of
the GDI API's ability to output DIB (BMP) images, which can be run
through ffmpeg's existing BMP decoder.

Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-03 00:41:45 +02:00
Clément Bœsch cecb6d6f83 Changelog: remove unecessary "added" 2014-04-02 07:45:06 +02:00
Nedeljko Babic 696e34a6e1 libavcodec: Implementation of AC3 fixedpoint decoder 
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-01 19:01:57 +02:00
Michael Niedermayer 767b1daf4b Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4' 
* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
  sgi: decode 16bit RLE images

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-01 04:19:27 +02:00
Michael Niedermayer 4ebfcd62af Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38' 
* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38':
  sgi: encode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog
	libavcodec/sgienc.c

See: 21a1006109
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-01 04:13:53 +02:00
Michael Niedermayer 23290c86bf Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f' 
* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog

See: 0b1f20e23c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-01 04:03:31 +02:00
Michael Niedermayer 95582b5ccc Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b' 
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
  OpenEXR decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/exr.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-01 03:16:56 +02:00
Vittorio Giovara d613091f88 sgi: decode 16bit RLE images 2014-04-01 01:19:03 +02:00
Vittorio Giovara 6c1df1f228 sgi: encode images with 4 channels at 8 and 16 bits 2014-04-01 01:19:03 +02:00
Carl Eugen Hoyos f8dea10d3f sgi: decode images with 4 channels at 8 and 16 bits 2014-04-01 01:19:03 +02:00
Jimmy Christensen 38389058c3 OpenEXR decoder 
Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno,
Nicolas George, Paul B Mahol and Michael Niedermayer.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-01 01:13:09 +02:00
Vadim Kalinsky 234f0bcb0c lavd: Add QTKit input device. 
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 20:45:07 +02:00
Michael Niedermayer 296e63efa5 Merge commit '678082b409aca711f9cf991df6b0200116489322' 
* commit '678082b409aca711f9cf991df6b0200116489322':
  X-Bitmap decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavcodec/xbmdec.c

See: a0340dfbd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 05:26:24 +01:00
Paul B Mahol fb5cf145b6 bmp: add a standalone parser 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-28 00:08:24 +01:00
Vittorio Giovara 678082b409 X-Bitmap decoder 2014-03-27 23:59:13 +01:00
Paul B Mahol 70daeacd6e PAF demuxer and decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-27 23:34:47 +01:00
Michael Niedermayer f392949f1a Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f' 
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
  BRender PIX image decoder

Conflicts:
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h

See: 492a5f835c, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 21:09:17 +01:00
Aleksi Nurmi ae17878fb2 BRender PIX image decoder 
Further enhancements by Vittorio Giovara and Paul B Mahol.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-27 18:27:23 +01:00
Michael Niedermayer 12ab07be44 Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' 
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
  Alias PIX image encoder and decoder

Conflicts:
	Changelog
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 01:10:28 +01:00
Vittorio Giovara e50f5d3cf9 Alias PIX image encoder and decoder 2014-03-26 23:25:02 +01:00
Peter Ross 89f2f5dbd7 On2 VP7 decoder 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 13:29:05 +01:00
Michael Niedermayer 1034fbdf53 Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7' 
* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
  mp3dec: export replaygain tags from ID3v2

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 15:11:08 +01:00
Anton Khirnov 15c5a8d22d mp3dec: export replaygain tags from ID3v2 2014-03-24 06:13:39 +01:00
Carl Eugen Hoyos 942cded690 Autodetect VDA like all other hardware acccelerations. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 17:47:28 +01:00
Michael Niedermayer acb8d655d7 Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b' 
* commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b':
  changelog: switch libx265 and compand entries

Conflicts:
	Changelog

Not many changes as libx265 and compand are placed correctly for us

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 03:46:40 +01:00
Vittorio Giovara d5717bc4e9 changelog: switch libx265 and compand entries 2014-03-23 01:56:58 +01:00
Michael Niedermayer b74792a027 Changelog: move post 2.2 branching entries out of the 2.2 changelog 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-16 19:15:58 +01:00
Peter Ross 40f88796c6 Phantom Cine demuxer (iteration 2014.3) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-16 18:24:30 +01:00
Nicolas George 97e87e09c8 lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
Michael Niedermayer 2fb0027c26 Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
  lavfi: add shuffleplanes filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 13:07:20 +01:00
Anton Khirnov 599b81ca9a lavfi: add shuffleplanes filter 2014-03-05 21:52:02 +01:00
Michael Niedermayer e4a6310cce update for 2.2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-01 03:34:59 +01:00
Andrew Kelley 738f83582a lavfi: add compand audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-26 08:09:58 +01:00
Nicholas Robbins b4d308c04f lavfi: adding dejudder filter to remove judder produced by partially telecined material. 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 17:43:58 +01:00
Derek Buitenhuis 50ea93158d Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:13:17 +00:00
Derek Buitenhuis bb6b1731eb Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:12:22 +00:00
Michael Niedermayer 51290068fa Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28' 
* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
  dnxhd: Support DNx444

Conflicts:
	Changelog
	libavcodec/dnxhddata.c
	libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 03:42:06 +01:00
Kostya Shishkov e95018b694 dnxhd: Support DNx444 
Bug-Id: 99
Bug-Id: videolan/9620
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-02-09 19:53:35 +01:00
Michael Niedermayer 0c4bf87b29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Mirillis FIC video decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 19:02:46 +01:00
Kostya Shishkov cde7df25ef Mirillis FIC video decoder 
Does not contain cursor rendering yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-08 15:04:13 +00:00
James Darnley 9a6d91b6b6 Changelog: add entries relating to metadata_header_padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-30 20:37:07 +01:00
Lukasz Marek ded6b3af41 lavd: add opengl device 
It can render to OpenGL context provided by application or into SDL window

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-27 15:18:18 +01:00
James Almer 8bfa5f7fab webp: fix capitalization of the word Exif 
Also remove "webp:" from log messages. Using the AVCodecContext is enough.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-15 02:54:36 +01:00
James Almer 0b54bc24db webp: add support for EXIF metadata chunks 
Based on mjpeg code by Thilo Borgmann

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 05:08:22 +01:00
Michael Niedermayer e2bb185e62 nut: Support XYZ12 rawvideo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 17:51:13 +01:00
Michael Niedermayer 402a411406 Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:00:48 +01:00
Vittorio Giovara a7d0e7ead9 lavfi: add framepack filter 2014-01-09 23:13:05 +01:00
Maxim Polijakowski e6f0bb6527 ATRAC3+ decoder 
Cleanup by Diego Biurrun.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-01-09 19:33:07 +01:00
Michael Niedermayer de5b6c736b Changelog: add nuts side & metadata support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-04 15:07:52 +01:00
James Almer d890db5f53 oggdec: add support for VP8 demuxing 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-30 04:05:27 +01:00