virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
72,678 Commits 37 Branches 400 Tags 465 MiB
51080dfa08
Commit Graph

1263 Commits

Author SHA1 Message Date
Gilles Chanteperdrix
96084251e5 libavformat: add robust MPEG audio depacketization (RFC 5219) 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-21 23:37:50 +02:00
Gilles Chanteperdrix
5e5583efe4 libavformat: add AC3 RTP depacketization (RFC 4184) 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-21 23:37:32 +02:00
Kevin Wheatley
31c7c0e156 avformat/movenc: Move avid DNxHD padding to the correct spot 
Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd

ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg,
when outputting DNxHD due to the incorrect padding placement. Now we add the
padding in the correct place

Tidy up FATE changes due to padding changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-20 12:17:14 +01:00
Michael Niedermayer
e821910a21 Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499' 
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
  lavf: Add DSS demuxer

Conflicts:
	libavformat/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:44:58 +01:00
Michael Niedermayer
dfe5a9f022 Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b' 
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
  lavc: Add DSS SP decoder

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:31:26 +01:00
Michael Niedermayer
841e9f431c Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6' 
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
  lavc: add an Intel libmfx-based H.264 decoder

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:12:04 +01:00
Oleksij Rempel
062cd5a975 lavf: Add DSS demuxer 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-19 12:05:19 -05:00
Oleksij Rempel
c56b9b1eb2 lavc: Add DSS SP decoder 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-19 12:05:19 -05:00
Anton Khirnov
4e08c82110 lavc: add an Intel libmfx-based H.264 decoder 
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.
 2015-02-19 15:08:49 +01:00
Michael Niedermayer
8242946af2 Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e' 
* commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e':
  changelog: mention DXVA/HEVC and AAC ELD480

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:08:21 +01:00
Thomas Volkert
cbe508553a avformat/rtpdec: DV depacketizer (RFC 6469) 
Tested with live555 RTSP server

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 19:35:19 +01:00
Anton Khirnov
d3449ac938 changelog: mention DXVA/HEVC and AAC ELD480 2015-02-15 15:30:21 +01:00
Thomas Volkert
e4a6486c17 rtpdec: experimental VP9 depacketizer (draft 0) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 14:54:45 +01:00
Clément Bœsch
4ab7eb0da2 avfilter: bump minor and Changelog document the new filters 2015-02-14 20:49:08 +01:00
Gilles Chanteperdrix
3eec775b21 avformat/rtpdec_ac3: add AC3 RTP depacketization (RFC 4184) 
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-14 20:13:52 +01:00
Gilles Chanteperdrix
22470510d1 avformat/rtpdec_mpeg12: add robust MPEG audio depacketization (RFC 5219) 
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-14 19:33:24 +01:00
Paul B Mahol
edf217ebb7 avfilter: add dcshift filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-11 14:58:35 +00:00
Paul B Mahol
3a8801eb8d Changelog: mention more ported filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-11 11:46:34 +00:00
Kevin Wheatley
7fc33dca39 libavformat: DNxHD in .mov, switch unspecified color_range to mpeg 
Avid prefers mpeg range [16-235] by default this change brings
ffmpeg into line with that. To obtain the old behaviour use
'-color_range jpeg' on the command line prior to the ouput
filename.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-10 16:46:12 +01:00
Paul B Mahol
e7e0005cc6 remove libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 12:01:54 +00:00
Michael Niedermayer
56252a5e09 Merge commit '1a07df31128da3a0020b66502399989b91770d44' 
* commit '1a07df31128da3a0020b66502399989b91770d44':
  DNxHD: Add support for id 1258 (DNx100 960x720@8)

Conflicts:
	Changelog
	libavcodec/dnxhddata.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 21:21:49 +01:00
Vittorio Giovara
1a07df3112 DNxHD: Add support for id 1258 (DNx100 960x720@8) 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-29 15:04:57 +00:00
Supraja Meedinti
6ad749b533 libavutil: Added twofish symmetric block cipher 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 01:56:11 +01:00
Clément Bœsch
f532603993 avfilter: add showpalette filter 2015-01-15 16:36:13 +01:00
Stefano Sabatini
c648879827 Changelog: mention the port of various mp PP filters 2015-01-13 13:13:04 +01:00
Anshul Maheshwari
78e78f621b Adding Closed caption accessories 
Signed-off-by: Anshul Maheshwari <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-11 22:19:48 +01:00
Michael Niedermayer
c8f83a4c78 avformat/voc: add seeking support 
Fixes Ticket1333

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-11 00:35:01 +01:00
Michael Niedermayer
c09eeca546 Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4' 
* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4':
  libavcodec: Add an OpenH264 encoder wrapper

Conflicts:
	Changelog
	configure
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:48:23 +01:00
Martin Storsjö
8a3d9ca603 libavcodec: Add an OpenH264 encoder wrapper 
Compared to existing, common opensource H264 encoders, this can be
useful since it has got a different license (BSD instead of GPL).

Performance- and qualitywise it is comparable to x264 in ultrafast
mode.

Hooking it up as an encoder in libavcodec also simplifies comparing
it against other common encoders.

This requires OpenH264 1.3 or newer. Since the OpenH264 API and ABI
changes frequently, only releases are supported.

To take advantage of the OpenH264 patent offer, the OpenH264 library
must not be redistributed, but downloaded at runtime at the end-user's
system.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-06 19:58:44 +02:00
Supraja Meedinti
c6bb651bce libavutil: Added Camellia symmetric block cipher 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version of this patch reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 15:19:36 +01:00
Michael Niedermayer
4c7a1ccb36 Changelog: Add cropdetect non 8bpp 
Suggested-by: Reimar
Previous patch reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 14:44:31 +01:00
Stefano Sabatini
d4fd3f24e8 lavfi: add tblend filter 2014-12-27 16:15:24 +01:00
Michael Niedermayer
68609edd4a Changelog: Mention non continuous cache protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-26 00:49:22 +01:00
Michael Niedermayer
7ef515cda5 Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a' 
* commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a':
  libavformat: Add a muxer wrapping mpegts encoding into RTP

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 02:49:36 +01:00
Michael Niedermayer
5162af67f4 Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f' 
* commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f':
  rtp: Initial H.261 support

Conflicts:
	Changelog
	libavformat/rtpdec_h261.c
	libavformat/rtpenc_h261.c
	libavformat/sdp.c
	libavformat/version.h

See: 50a4d5cfc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 02:34:17 +01:00
James Almer
430a816859 oggdec: add support for VP8 demuxing 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-12-18 23:27:07 +01:00
Martin Storsjö
8a70ef94b9 libavformat: Add a muxer wrapping mpegts encoding into RTP 
Since this structurally is quite different from normal RTP
(multiple streams are muxed into one single mpegts stream,
which is packetized into one single RTP session), it is kept
as a separate muxer.

Since this structurally also behaves differently than normal
RTP, all of the other muxers that do chained RTP muxing
(rtsp, sap, mp4) would need to be updated similarly to handle
this - in particular, creating one single rtp_mpegts muxer
for the whole presentation instead of one rtp muxer per stream.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-18 23:12:33 +02:00
Thomas Volkert
a505c0d737 rtp: Initial H.261 support 
The packetizer only supports splitting at GOB headers - if
such aren't available frequently enough, it splits at any
random byte offset (not at a macroblock boundary either, which
would be allowed by the spec) and sends a payload header pretend
that it starts with a GOB header.

As long as a receiver doesn't try to handle such cases cleverly
but just drops broken frames, this shouldn't matter too much
in practice.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-18 23:11:37 +02:00
Thomas Volkert
00d7555f34 wavdec: RIFX file format support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-18 00:10:35 +01:00
Paul B Mahol
5f90ef6611 lavfi: add colorlevels filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-12-16 10:10:04 +00:00
Michael Niedermayer
9887e7df9b Changelog: Add 10bit spp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 18:59:13 +01:00
Timo Rothenpieler
2a428db5e2 avcodec: Add NVENC encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 01:06:27 +01:00
Michael Niedermayer
f478bdabf2 Changelog: add 2.5 entry 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 01:28:06 +01:00
Michael Niedermayer
1027a44681 Changelog: Add libpostproc visualization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 22:40:02 +01:00
Benoit Fouet
155f4dd668 doc: add entry for APNG demuxer where needed. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-25 18:28:32 +01:00
Michael Niedermayer
8294f5042d Changelog: remove 24bit lossless wma entry for now, some samples work others do not yet work 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-24 00:36:58 +01:00
Michael Niedermayer
ce6141259b avcodec/wmalosslessdec: support 24bit lossless 
Not checked if its actually lossless
Fixes Ticket1847

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 20:51:15 +01:00
Michael Niedermayer
0c3ebbf6a5 Changelog: add zygoaudio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 20:21:56 +01:00
Michael Niedermayer
c661601f45 Changelog: add WebP muxer 
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 03:21:05 +01:00
Michael Niedermayer
b5b15c4dd9 Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977' 
* commit 'fe5e6e34c05e274f98528be4f77f3c474473f977':
  lavf: Add an MPEG-DASH ISOFF segmenting muxer

Conflicts:
	Changelog
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 22:13:50 +01:00
Michael Niedermayer
9e0b0c60bd Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef' 
* commit '2ded57371abead879bcee56da5131e5fac0d17ef':
  movenc: Add support for writing sidx atoms for DASH segments

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 21:55:23 +01:00
Martin Storsjö
fe5e6e34c0 lavf: Add an MPEG-DASH ISOFF segmenting muxer 
This is mostly to serve as a reference example on how to segment
the output from the mp4 muxer, capable of writing the segment
list in four different ways:
- SegmentTemplate with SegmentTimeline
- SegmentTemplate with implicit segments
- SegmentList with individual files
- SegmentList with one single file per track, and byte ranges

The muxer is able to serve live content (with optional windowing)
or create a static segmented MPD.

In advanced cases, users will probably want to do the segmenting
in their own application code.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-17 16:17:07 +02:00
Martin Storsjö
2ded57371a movenc: Add support for writing sidx atoms for DASH segments 
A flag "dash" is added, which enables the necessary flags for
creating DASH compatible fragments.

When this is enabled, one sidx atom is written for each track
before every moof atom.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-17 16:16:46 +02:00
Lukasz Marek
a38e06c1aa ffserver_config: handle codec private options 
This commit allows to set codec's private option.
As side effect, it also improves preset support.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
Thilo Borgmann
d525e662e4 Changelog: Mention AVFoundation screen capturing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 18:28:12 +01:00
Clément Bœsch
ae65a84517 Changelog: explicit that xBR scaler is implemented as a filter 2014-11-10 06:24:54 +01:00
Arwa Arif
19d0949d31 lavfi: add xbr filter xBR 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-10 03:45:00 +01:00
Thomas Volkert
07c3a4f693 avformat/udp: UDP-Lite (RFC 3828) support added 
(This fixes ticket #1501)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-05 11:16:05 +01:00
Michael Niedermayer
a38a1d516f Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96' 
* 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-27 21:26:51 +01:00
Luca Barbato
a6674d2e77 xcbgrab: XCB-based screen capture 
Matches the x11grab screen capture by features.
 2014-10-26 08:47:41 +01:00
Michael Niedermayer
4ef02ddd81 Changelog: add entry for libutvideo 422P10 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 00:22:04 +02:00
Eejya Singh
6dc99fdf0e Added STL demuxer and decoder 
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-10-22 23:12:38 +02:00
Supraja Meedinti
0eabbe2101 libavutil: Add CAST128 symmetric block cipher 
Only ECB mode is supported at the moment

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 01:33:45 +02:00
Tobias Rapp
33db99548b Changelog: add "ffprobe -show_pixel_formats option" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-08 16:58:14 +02:00
wm4
7dd2005e1a avformat: add SUP/PGS subtitle demuxer 
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-09-26 10:35:14 +02:00
Thomas Volkert
ddf5fb71ee rtpenc: HEVC/H.265 support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-24 23:33:26 +03:00
Thomas Volkert
6821a5a4ad rtpenc: HEVC/H.265 support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-21 12:49:08 +02:00
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