Michael Niedermayer
808db3e687
Changelog: add 2.4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-14 16:47:26 +02:00
Clément Bœsch
5eef7042d8
Changelog/RELEASE_NOTES: prepare for 2.4
2014-09-14 13:41:49 +02:00
Carl Eugen Hoyos
552ce6874c
Revert the default for ffplay to -noautoexit.
...
Reviewed-by: Marton Balint
2014-09-08 17:51:12 +02:00
Michael Niedermayer
f9bc65e399
Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce'
...
* commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce':
avplay: Exit by default at the end of playback
Conflicts:
Changelog
ffplay.c
Changes to ffplay not merged as they would break -autoexit as a way to override -noautoexit,
the change of the default will be implemented in the next commit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-06 20:23:29 +02:00
Diego Biurrun
041caf1a63
avplay: Exit by default at the end of playback
...
This is the expected behavior shared by all other cli multimedia players.
Bug-Id: 732
2014-09-06 16:52:59 +02:00
Paul B Mahol
422619646e
add silenceremove filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-09-05 17:30:57 +00:00
Michael Niedermayer
2178abd3b5
Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'
...
* commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040':
changelog: Move Ogg subtypes aliases entry to the correct release
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 04:45:30 +02:00
Diego Biurrun
d7913bf59c
changelog: Move Ogg subtypes aliases entry to the correct release
2014-09-04 15:12:46 -07:00
Michael Niedermayer
53b0892005
Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac'
...
* commit 'd9792b773516a560ecb99694b8ee745a50027fac':
Mark 11 release in the changelog
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-04 20:50:01 +02:00
Diego Biurrun
d9792b7735
Mark 11 release in the changelog
...
Also fix some typos in the entries for the 11 release.
2014-09-04 17:01:36 +02:00
Timothy Gu
17ad5fbb8a
Use makeinfo to generate html doc for the new website
...
texi2html is deprecated by upstream in favor of makeinfo/texi2any. See:
- https://www.gnu.org/software/texinfo/manual/texinfo/html_node/texi2html.html
- https://wiki.debian.org/Texi2htmlTransition
- https://lists.debian.org/debian-devel/2013/05/msg01516.html
This is actually two separate changes.
Based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>.
Fixes Trac ticket #3232 .
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-09-04 02:34:20 +02:00
Michael Niedermayer
4bc4f6f170
Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'
...
* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
rtpdec: HEVC/H.265 support
Conflicts:
Changelog
libavformat/rtpdec_hevc.c
libavformat/version.h
See: 96b2ba68c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 14:56:53 +02:00
Thomas Volkert
95e177eeb2
rtpdec: HEVC/H.265 support
...
As specified in draft-ietf-payload-rtp-h265-06.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-09-03 02:39:24 +02:00
Thomas Volkert
f8164f6728
Add missing changelog entry
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 21:40:34 +02:00
Michael Niedermayer
fcc3909908
Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
...
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
matroskadec: parse stereo mode on decoding
Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c
See: 4c509fe305
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 23:48:23 +02:00
Vittorio Giovara
d4ae8ac92f
matroskadec: parse stereo mode on decoding
...
Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.
Bump the doctype version supported.
Bug-Id: 728 / https://bugs.debian.org/757185
2014-08-28 12:33:26 -04:00
Clément Bœsch
f888331769
avfilter: add codecview filter
2014-08-24 14:35:11 +02:00
Michael Niedermayer
2f0f937577
Changelog: add "H.261 RTP payload format (RFC 4587)"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 04:11:37 +02:00
James Almer
b140b51ebb
lavc/tiff: add support for LZMA compression
...
Derived from deflate code.
Requires liblzma.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 01:21:39 +02:00
Luca Barbato
051aadeed1
ogg: Provide aliases for Speex, Opus and audio-only ogg
...
Since they are aliases for ogg enabling any of them enables ogg as well.
2014-08-22 13:23:50 +02:00
Michael Niedermayer
b8e4c11d93
Merge commit '481a3667495425db9fdffb653292b6460fb68208'
...
* commit '481a3667495425db9fdffb653292b6460fb68208':
cmdutils: allow matching by metadata in stream specifiers
Conflicts:
Changelog
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 00:41:21 +02:00
Michael Niedermayer
313d75cd43
Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'
...
* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
http: enable icy metadata by default.
Conflicts:
Changelog
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-13 22:54:31 +02:00
Clément Bœsch
8fcd9386ec
Changelog: notify about the recent performance boost in dctdnoiz filter
2014-08-13 20:02:21 +02:00
Anton Khirnov
481a366749
cmdutils: allow matching by metadata in stream specifiers
2014-08-13 17:24:18 +00:00
Andrew Stone
7e38903b5c
http: enable icy metadata by default.
...
It won't hurt servers that don't care about the header,
and those that do will include it by default.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-13 16:10:15 +00:00
Daniel Oberhoff
9f617a14a0
avfilter: ported lenscorrection filter from frei0r
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-12 03:33:30 +02:00
ePirat
e3dc2c86fc
libavformat: Add Icecast protocol
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 13:33:44 +02:00
Marvin Scholz
eb9244f202
Add Icecast protocol
...
Icecast is basically a convenience wrapper around the HTTP protocol.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-04 12:56:42 +03:00
Michael Niedermayer
a61325798a
Changelog: add "version <next>:" so people dont add new things to the last release
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 02:38:26 +02:00
Michael Niedermayer
faafd1e4f1
Changelog: change "version <next>" to "version 2.3"
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 02:09:06 +02:00
Marc Jeffreys
a0b71e9f3e
avfilter/drawtext: Add basic text shaping using libfribidi
...
Fixes ticket #3758
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 00:40:39 +02:00
Vignesh Venkatasubramanian
3e73d14290
lavf: Add WebM DASH Manifest Muxer
...
This patch adds the ability to generate WebM DASH manifest XML using
ffmpeg. A sample command line would be as follows:
ffmpeg \
-f webm_dash_manifest -i video1.webm \
-f webm_dash_manifest -i video2.webm \
-f webm_dash_manifest -i audio1.webm \
-f webm_dash_manifest -i audio2.webm \
-map 0 -map 1 -map 2 -map 3 \
-c copy \
-f webm_dash_manifest \
-adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \
manifest.xml
It works by exporting necessary fields as metadata tags in matroskadec
and use those values to write the appropriate XML fields as per the WebM
DASH Specification [1]. Some ideas are adopted from webm-tools project
[2].
[1]
https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification
[2]
https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15 23:58:36 +02:00
Lukasz Marek
4cc0f79a2c
lavf: add samba protocol via libsmbclient
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13 20:38:55 +02:00
Star Brilliant
3f815f713b
AVFormat: LRC demuxer and muxer
...
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13 19:18:31 +02:00
Carl Eugen Hoyos
d538dd824e
avformat: Add image3 demuxers with format autodetection
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 18:14:06 +02:00
Paul B Mahol
b52c26c66f
avfilter: add flanger filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-07-03 08:07:42 +00:00
Clément Bœsch
ded3c9fd32
avfilter: add hqx filter (hq2x, hq3x, hq4x)
...
Partially fixes Ticket #3404 (xbr filter remaining)
2014-06-21 19:22:55 +02:00
Anton Khirnov
894682a973
Remove avserver.
...
It has not been properly maintained for years and there is little hope
of that changing in the future.
It appears simpler to write a new replacement from scratch than
unbreaking it.
2014-06-18 14:55:28 +02:00
Clément Bœsch
76bce46d8f
avfilter: add signalstats filter
...
Signed-off-by: Mark Heath <silicontrip@gmail.com>
Signed-off-by: Dave Rice <dave@dericed.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
2014-06-11 21:17:24 +02:00
Paul B Mahol
4b6cb1cc69
Zoom & Pan filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-06-09 12:41:33 +00:00
Muhammad Faiz
40e938a7ed
avfilter: new multimedia filter avf_showcqt.c
...
this filter is the same as showspectrum but with constant Q transform,
so frequency is spaced logarithmically
2014-06-05 14:04:01 +02:00
Lou Logan
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
Aman Gupta
4372fb7a57
avcodec/webvttenc: add webvtt encoder
...
Based off the srt encoder. The following features are unimplemented:
- fonts, colors, sizes
- alignment and positioning
The rest works well. For example, use ffmpeg to convert subtitles into the .vtt format:
ffmpeg -i input.srt output.vtt
Signed-off-by: Aman Gupta <ffmpeg@tmm1.net>
Signed-off-by: Clément Bœsch <u@pkh.me>
2014-05-25 03:04:14 +02:00
Michael Niedermayer
ef1d4ee2f8
Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'
...
* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
Add transformation matrix API.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 19:12:30 +02:00
Vittorio Giovara
bddd8cbf68
Add transformation matrix API.
...
Add AV_PKT_DATA_DISPLAYMATRIX and AV_FRAME_DATA_DISPLAYMATRIX as stream and
frame side data (respectively) to describe a display transformation matrix
for linear transformation operations on the decoded video.
Add functions to easily extract a rotation angle from a matrix and
conversely to setup a matrix for a given rotation angle.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-19 13:13:10 +02:00
Michael Niedermayer
2c7d3ecfc9
Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'
...
* commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222':
lavc: add a native Opus decoder.
Conflicts:
Changelog
configure
libavcodec/version.h
Fate tests pass with both avresample as well as swresample based opus decoder, but
are disabled (reference files are very large so i want to think a day or 2 about
if theres an alternative or if they could be avoided, they also dont match the
official samples)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15 18:20:17 +02:00
Anton Khirnov
b70d7a4ac7
lavc: add a native Opus decoder.
...
Initial implementation by Andrew D'Addesio <modchipv12@gmail.com> during
GSoC 2012.
Completion by Anton Khirnov <anton@khirnov.net>, sponsored by the
Mozilla Corporation.
Further contributions by:
Christophe Gisquet <christophe.gisquet@gmail.com>
Janne Grunau <janne-libav@jannau.net>
Luca Barbato <lu_zero@gentoo.org>
2014-05-15 06:49:34 +02:00
Michael Niedermayer
0aac9b76bc
avcodec/libx264: Implement reference frame count limiting based on level
...
This makes libavcodec/libx264.c behave more similar to the x264 command line
util
Fixes Ticket3307
Implementation based on x264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-14 02:57:10 +02:00
Michael Niedermayer
154d80eae7
Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'
...
* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
lavfi: add Bauer stereo-to-binaural audio filter
Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 14:14:10 +02:00
Alessandro Ghedini
1c0210c798
lavfi: add Bauer stereo-to-binaural audio filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-01 08:00:30 +02:00
Michael Niedermayer
c6eee3120a
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
...
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:22:22 +02:00
Hendrik Leppkes
35177ba77f
avconv: add support for DXVA2 decoding
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-28 21:21:54 +02:00
Michael Niedermayer
56efd98a65
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
...
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-23 20:47:13 +02:00
Kostya Shishkov
e2834567d7
On2 AVC decoder
2014-04-23 19:57:44 +02:00
Michael Niedermayer
e37dbfddda
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
...
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
Silicon Graphics RLE 8-bit video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h
See: afa1617b93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 19:26:46 +02:00
Peter Ross
55ddd700c6
Silicon Graphics Movie demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:27 +02:00
Peter Ross
07761294fc
Silicon Graphics RLE 8-bit video decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:26 +02:00
Peter Ross
86a0432688
Silicon Graphics Motion Video Compressor 1 & 2 decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:26 +02:00
Peter Ross
ab683efb2b
Magic Lantern Video (MLV) demuxer
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 05:06:00 +02:00
Peter Ross
5f4f9ee99f
Direct Stream Digital (DSD) decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-15 20:35:57 +02:00
Thilo Borgmann
d2417061ef
Add AVFoundation input device.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 17:51:33 +02:00
Nicolas George
ad8159e0fe
libavfilter: Add asettb filter for setting timebase for audio
...
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.
Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-10 12:52:19 +02:00
Paul B Mahol
718907cd88
libtwolame MP2 encoding support
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-07 23:50:33 +02:00
Michael Niedermayer
5297003aa7
Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'
...
* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
LucasArts SMUSH demuxer
Conflicts:
Changelog
doc/general.texi
libavformat/smush.c
libavformat/version.h
See: bef8fd7099
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 23:29:47 +02:00
Michael Niedermayer
787be6d074
Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'
...
* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89':
LucasArts SMUSH VIMA audio decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavcodec/vima.c
This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav
See: b18357326c
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 23:14:23 +02:00
Michael Niedermayer
881f4e8d34
Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
...
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
LucasArts SMUSH SANM video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/sanm.c
libavcodec/version.h
See: 69254f4628
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 22:19:16 +02:00
Anssi Hannula
edf4406c4d
avformat/hls: add support for alternative renditions
...
HLS protocol version 4 added alternative renditions to the
specification (e.g. alternative audio tracks).
The EXT-X-MEDIA tags can also contain metadata for "renditions" (i.e.
tracks) of the main Media Playlist.
Add support for those.
Note that the same rendition (AVStream) may be associated with multiple
variants (AVPrograms).
Alternative subtitle tracks will require additional work and are
therefore not enabled yet.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2014-04-06 17:55:02 +03:00
Paul B Mahol
eeadcdfd1a
LucasArts SMUSH demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:41:41 +02:00
Paul B Mahol
6f273093e5
LucasArts SMUSH VIMA audio decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:41:39 +02:00
Paul B Mahol
a420ccd4f2
LucasArts SMUSH SANM video decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:40:27 +02:00
Peter Ross
ac4b32df71
On2 VP7 decoder
...
Further performance improvements and security fixes by
Vittorio Giovara, Luca Barbato and Diego Biurrun.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-04 04:00:11 +02:00
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
Maxim Poliakovski
2e1fb96af3
ATRAC+ decoder
...
Cleanup by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-29 01:11:16 +01:00
Michael Niedermayer
6fe5f770db
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
...
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
Add a libwebp encoder
Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22 11:53:41 +01:00
Justin Ruggles
be7c323176
Add a libwebp encoder
2013-12-21 17:01:42 -05:00
Peter Holik
6fd99e78de
png: add a standalone parser
...
Useful for reading png images from a pipe.
2013-12-17 09:34:08 +01:00
Timothy Gu
96093fe180
Changelog: correct typo
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-12-14 21:47:17 +01:00
Michael Niedermayer
93cf43ec3f
Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
...
* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c':
changelog: drop redundant new attribute
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-12 19:55:06 +01:00
Vittorio Giovara
a2eeed619d
changelog: drop redundant new attribute
2013-12-12 16:10:15 +01:00
Michael Niedermayer
7a60348053
Merge commit '7e244c68600f479270e979258e389ed5240885fb'
...
* commit '7e244c68600f479270e979258e389ed5240885fb':
avframe: add codec-independent stereoscopic metadata
Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 21:33:51 +01:00
Vittorio Giovara
7e244c6860
avframe: add codec-independent stereoscopic metadata
2013-12-09 16:02:43 +01:00
Stefano Sabatini
e424abc3a0
lavfi: add aeval filter
2013-12-06 10:57:26 +01:00
James Almer
56572787ae
Add Windows resource file support for shared libraries
...
Originally written by James Almer <jamrial@gmail.com>
With the following contributions by Timothy Gu <timothygu99@gmail.com>
* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.
[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05 23:42:07 +01:00
Michael Niedermayer
75ec40b083
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: remove mp3_header_(de)compress bitstream filters
Conflicts:
Changelog
libavcodec/mp3_header_compress_bsf.c
libavcodec/mp3_header_decompress_bsf.c
The decompress filter is left in place for interoperability and support of
files that used the compress filter.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26 13:13:45 +01:00
Michael Niedermayer
ac021fdc40
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
...
* commit '56d061ce9da954560892e3551513d5ecc0439846':
metasound: add last missing modes (8kHz @ 6kbps per channel)
Conflicts:
Changelog
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26 12:28:31 +01:00
Anton Khirnov
c6080d8900
lavc: remove mp3_header_(de)compress bitstream filters
...
They mangle the mp3 header in a non-standard way to save a few bytes.
People who care about space so much should just use a more efficient
codec.
2013-11-26 09:27:50 +01:00
Kostya Shishkov
56d061ce9d
metasound: add last missing modes (8kHz @ 6kbps per channel)
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-26 08:29:42 +01:00
Michael Niedermayer
3e641b4842
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
...
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:46:48 +01:00
Anton Khirnov
7671dd7cd7
avconv: add support for VDPAU decoding
2013-11-23 11:55:53 +01:00
Stefano Sabatini
cbba331aa0
ffprobe: implement string validation setting
...
This should fix trac tickets #1163 , #2502 .
2013-11-22 16:51:56 +01:00
Ronald S. Bultje
72ca830f51
lavc: VP9 decoder
...
Originally written by Ronald S. Bultje <rsbultje@gmail.com> and
Clément Bœsch <u@pkh.me>
Further contributions by:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö <martin@martin.st>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-15 10:16:28 +01:00
Stefano Sabatini
8cd3685a3f
lavfi: add elbg filter
2013-11-13 11:21:57 +01:00
Michael Niedermayer
a75bf4e5c1
Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
...
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
vf_aspect: support variables in evaluating the aspect ratios
Conflicts:
Changelog
doc/filters.texi
libavfilter/vf_aspect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 11:54:19 +01:00
Rudolf Polzer
3a14b160bd
vf_scale: make the dar variable return the DAR.
...
Before, it just returned width/height. Correct is width/height*sar.
That way it is consistent with DAR as in probe output and setdar.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-02 21:16:29 +01:00
Rudolf Polzer
34a0ac41a8
vf_aspect: support variables in evaluating the aspect ratios
...
Example: -vf setsar=sar="sar*9/10"
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-02 21:14:08 +01:00
Michael Niedermayer
641358addc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add an HDS live fragmenting muxer
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 10:38:03 +01:00
Martin Storsjö
435214a757
Add an HDS live fragmenting muxer
...
HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-02 10:51:00 +02:00
Michael Niedermayer
6262763d8d
Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'
...
* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
mpegts: Support HEVC demuxing
Conflicts:
Changelog
libavformat/version.h
See: 93c1fe4de3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:05:25 +01:00
Michael Niedermayer
0fbeeb9399
Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
...
* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
matroskadec: Support HEVC demuxing
Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h
See: 16b6839de6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:57:57 +01:00
Michael Niedermayer
3a0c902636
Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'
...
* commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7':
mov: Support HEVC demuxing
Conflicts:
Changelog
libavformat/mov.c
libavformat/version.h
See: 53f903b7c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:42:10 +01:00
Michael Niedermayer
b594aceb94
Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'
...
* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
Add raw HEVC demuxer
Conflicts:
Changelog
libavformat/hevcdec.c
libavformat/version.h
See: 902a5fa722
and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:33:05 +01:00