generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
77,084 Commits 24 Branches 241 Tags 173 MiB
162754c1e0
Commit Graph

1379 Commits

Author SHA1 Message Date
Michael Niedermayer
c5406d5e15 Changelog: add 2.8 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-06 15:59:40 +02:00
Carl Eugen Hoyos
f253c34175 lavc/j2kenc: Remove experimental flag. 
The encoder produces valid and - if requested - lossless files.
 2015-09-04 23:48:32 +02:00
Vittorio Giovara
c45fcf30cf DXV decoder 
Support all DXDI and DXD3 normal quality videos.
 2015-09-02 22:22:02 +02:00
Clément Bœsch
b48d8fa3ac avfilter: add allrgb 
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Clément Bœsch <u@pkh.me>
 2015-08-29 14:57:52 +02:00
Philip Langdale
1e50f953fa Changelog: Add VDPAU HEVC to the list 
Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-08-28 08:16:39 -07:00
Carl Eugen Hoyos
24e0b14c4f Changelog: Clarify that the new asf demuxer is optional. 2015-08-28 11:08:28 +02:00
Thilo Borgmann
2392da164a Changelog: Mention the change of the default webm codecs. 
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2015-08-28 06:05:41 +02:00
Paul B Mahol
15f4b3db58 avfilter: add framerate video filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-27 20:00:36 +00:00
Timo Rothenpieler
1dd854e10f vaapi: Add hevc hwaccel support 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
 2015-08-27 17:05:44 +02:00
Hendrik Leppkes
427598a2f4 Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083' 
* commit 'd68705c9756e6558c8e28d90b4c364f25ba72083':
  dnxhddata: Add tables for missing DNx100 profiles

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:40:06 +02:00
Paul B Mahol
319440e54f avfilter: add hstack & vstack filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-26 11:16:51 +00:00
Vittorio Giovara
d68705c975 dnxhddata: Add tables for missing DNx100 profiles 
1440x1080@8 progressive (1259) and interlaced (1260).

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-08-24 13:20:10 +02:00
Paul B Mahol
14f97bb2bc avfilter: add waveform monitor filter 2015-08-22 19:48:42 +00:00
Paul B Mahol
4e8963fa38 avfilter: add video vectorscope filter 2015-08-20 22:57:47 +00:00
Paul B Mahol
2fa019958b avfilter: add showfreqs filter 2015-08-19 16:15:13 +00:00
Paul B Mahol
f9905e13ea avfilter: add aphasemeter filter 2015-08-12 22:27:43 +02:00
Sebastien Zwickert
11d923d414 avcodec: add new Videotoolbox hwaccel. 2015-08-03 10:12:10 +02:00
Paul B Mahol
5b69fb783e avfilter: add atadenoise 2015-08-02 18:19:19 +02:00
Paul B Mahol
49a14a7616 avfilter: add allyuv source filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-02 14:13:59 +02:00
Paul B Mahol
4a2836eaf3 avfilter: add acrossfade filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-26 21:54:13 +00:00
Michael Niedermayer
508b79e6c1 Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986' 
* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
  lavc: add Intel libmfx-based HEVC decoder.

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsvdec.c
	libavcodec/qsvdec_h2645.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 01:20:46 +02:00
Michael Niedermayer
15bcbc9d3b Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741' 
* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 00:34:27 +02:00
Paul B Mahol
c1fa846d0c avfilter: add sidechain compress audio filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-25 22:07:20 +00:00
Ivan Uskov
fb57bc6c34 avcodec: Add QSV VC-1 video decoder. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 19:32:22 +02:00
Anton Khirnov
41d47ea85f lavc: add Intel libmfx-based HEVC decoder. 2015-07-25 17:37:01 +02:00
Ivan Uskov
6d0123f40e avcodec: Add QSV MPEG-2 video decoder. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 17:31:18 +02:00
Anton Khirnov
f89f78c1c5 lavc: add a HEVC mp4->annex B bitstream filter 2015-07-25 17:26:53 +02:00
Paul B Mahol
591741b51d avfilter: add areverse filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-24 02:06:48 +00:00
Jovan Zelincevic
9e3135f49e Edit documentation and versioning for the fixed point AAC decoder 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 23:25:33 +02:00
Paul B Mahol
787d370e14 avfilter: add deband filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-22 15:52:02 +00:00
Paul B Mahol
a8fbb7b625 avfilter: add random video filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-19 19:01:00 +00:00
Derek Buitenhuis
8271a84094 avfilter: Add reverse filter 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-07-19 14:13:51 +01:00
Paul B Mahol
ec6bef68f1 avfilter: bump minor and add Changelog entry 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-17 11:39:52 +00:00
Paul B Mahol
3001558487 avfilter: add erosion, dilation, deflate & inflate filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-15 13:21:47 +00:00
Arttu Ylä-Outinen
b90b6af710 avcodec: add libkvazaar HECV encoder 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 18:00:36 +02:00
Michael Niedermayer
7871eb4361 Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02' 
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
  lavc: add Intel libmfx-based HEVC encoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsv.c
	libavcodec/qsvenc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-09 11:53:14 +02:00
Michael Niedermayer
96ee6b9962 Merge commit '3a85397e8bb477eb34678d9edc52893f57003226' 
* commit '3a85397e8bb477eb34678d9edc52893f57003226':
  lavc: add Intel libmfx-based MPEG2 encoder

Conflicts:
	Changelog
	configure
	libavcodec/allcodecs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-09 11:17:12 +02:00
Anton Khirnov
66acb76bb0 lavc: add Intel libmfx-based HEVC encoder 2015-07-08 23:40:11 +02:00
Anton Khirnov
3a85397e8b lavc: add Intel libmfx-based MPEG2 encoder 2015-07-08 23:39:28 +02:00
Paul B Mahol
91748662bc avfilter: add removegrain 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-08 16:02:34 +00:00
Paul B Mahol
c3a5702ebf lavfi: add (a)drawgraph filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-03 18:43:21 +00:00
Michael Niedermayer
68939f7682 Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368' 
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
  Go2Meeting decoder

Conflicts:
	Changelog
	libavcodec/g2meet.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 03:18:30 +02:00
Kostya Shishkov
08c2d8f0aa Go2Meeting decoder 
ELS and ePIC decoder courtesy of Maxim Poliakovski,
cleanup and integration by Diego Biurrun.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-01 01:08:15 +02:00
Carl Eugen Hoyos
45441eb0f6 Changelog: Add jpeg 2000 improvements before they get forgotten. 2015-06-29 16:17:05 +02:00
Paul B Mahol
f76d7d4b01 avfilter: add showvolume filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-28 14:33:36 +00:00
Michael Niedermayer
30b8f3e7dc Merge commit 'b08569a23948db107e5e6175cd4c695427d5339d' 
* commit 'b08569a23948db107e5e6175cd4c695427d5339d':
  lavf: Replace the ASF demuxer

Conflicts:
	Changelog
	libavformat/asf.h
	libavformat/asfdec.c
	libavformat/version.h
	tests/ref/fate/wmv8-drm-nodec
	tests/ref/seek/lavf-asf

The rewritten demuxer is placed in a new file, the current demuxer is
left as default. Carl has tested both and the one working better is
default.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 13:36:54 +02:00
Alexandra Hájková
b08569a239 lavf: Replace the ASF demuxer 
The old one is the result of the reverse engineering and guesswork.
The new one has been written following the now-available specification.

This work is part of Outreach Program for Women Summer 2014 activities
for the Libav project.

The fate references had to be changed because the old demuxer truncates
the last frame in some cases, the new one handles it properly.
The seek-test reference is changed because seeking works differently
in the new demuxer. When seeking, the packet is not read from the stream
directly, but it is rather constructed by the demuxer. That is why
position is -1 now in the reference.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-06-28 10:16:40 +02:00
Paul B Mahol
5a1f785249 avfilter: add ssim filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-24 14:04:40 +00:00
Michael Niedermayer
2de6d13622 Changelog: Move HAP to the correct section 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 01:29:48 +02:00
Michael Niedermayer
ff68b83968 Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2' 
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 23:34:56 +02:00
Michael Niedermayer
55219a78c7 Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7' 
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
  Hap decoder and encoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 22:47:32 +02:00
Vittorio Giovara
5c018ee188 DirectDraw Surface image decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-22 15:23:08 +01:00
Vittorio Giovara
7ca3e5203f Hap decoder and encoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-22 15:23:08 +01:00
Luca Barbato
8655c54160 libvpx: Support the vp9 extended profiles 
Bump the minimum libvpx version to 1.3.0 and rework the configure logic
to fail only if no decoders and encoders are found.

Based on the original patch from Vittorio.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-21 16:27:18 +03:00
Rodger Combs
d4c9eced98 lavf/brstm: support little-endian files (BCSTM; 3DS) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 16:50:47 +02:00
Rodger Combs
7e7256c3a4 lavc: add little-endian ADPCM_THP decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 16:33:39 +02:00
Rodger Combs
bb42a7d4d4 lavf/brstm: add support for BFSTM files 
Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-17 13:24:11 +02:00
Andreas Cadhalpun
28efeb6502 doc: avoid incorrect phrase 'allows to' 
Also fix typo found by Lou Logan:
Sacrifying -> Sacrificing

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-16 21:48:51 +02:00
Timo Rothenpieler
f17d973413 avfilter/vf_colorkey: Add colorkey video filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-14 01:04:14 +02:00
Michael Niedermayer
3a99f6e79f Changelog: Add 2.7 entry 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-09 23:14:57 +02:00
Michael Niedermayer
8985e7c561 Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105' 
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
  mpjpeg: Initial implementation

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 00:44:28 +02:00
Luca Barbato
9b56ac74b1 mpjpeg: Initial implementation 
Support only streams with Content-Length.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-07 10:14:45 +02:00
Philip Langdale
e79c40fe72 avcodec/nvenc: Rename nvenc_h265 to nvenc_hevc 
For the sake of compatibility, and because pretty much everything else in the
codebase calls it HEVC.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:14:11 -07:00
Philip Langdale
d47de79372 Revert "Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'" 
This reverts commit d8bbb99c51, reversing
changes made to d0d0913702.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:14:02 -07:00
Philip Langdale
8a6536cbc0 Revert "Changelog: Drop duplicate NVENC entry" 
This reverts commit 440fa7758b.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:13:49 -07:00
Michael Niedermayer
440fa7758b Changelog: Drop duplicate NVENC entry 
Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 14:21:04 +02:00
Michael Niedermayer
d8bbb99c51 Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e' 
* commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e':
  nvenc: H264 and HEVC encoders

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

This implementation is merged under the name nvenc_b*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 03:13:55 +02:00
Luca Barbato
b08caa87c3 nvenc: H264 and HEVC encoders 
Partially based on the work of Timo Rothenpieler <timo@rothenpieler.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 15:17:22 +02:00
Rodger Combs
f24d92bada lavf/tls: Support Secure Transport 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-29 21:52:27 +02:00
Michael Niedermayer
947b74ee7d Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772' 
* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
  D3D11va: add a Direct3D11 video decoder similar to DXVA2

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dxva2_vc1.c
	libavcodec/version.h
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 22:24:34 +02:00
Steve Lhomme
d8039ef8d2 D3D11va: add a Direct3D11 video decoder similar to DXVA2 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-25 11:47:08 +02:00
Urvang Joshi
02cf59f3a6 WebP encoder: use WebPAnimEncoder API when available. 
WebPAnimEncoder API is a combination of encoder (WebPEncoder) and muxer
(WebPMux). It performs several optimizations to make it more efficient
than the combination of WebPEncode() and native ffmpeg muxer.

When WebPAnimEncoder API is used:
- In the encoder layer: we use WebPAnimEncoderAdd() instead of
  WebPEncode().
- The muxer layer: works like a raw muxer.

On the other hand, when WebPAnimEncoder API isn't available, the old code is
used as it is:
- In the codec layer: WebPEncode is used to encode each frame
- In the muxer layer:  ffmpeg muxer is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 03:31:28 +02:00
James Almer
e0a403e1c2 vp9: add missing changelog and APIchanges entries for new VP9 profiles 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-07 18:35:12 -03:00
Michael Niedermayer
39e89f5211 Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90' 
* commit '34efb8a169e4551326e069be47125c6c2cb7ab90':
  quickdraw: Support direct pixel blocks

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 20:40:26 +02:00
Vittorio Giovara
34efb8a169 quickdraw: Support direct pixel blocks 
Data is stored in separated components so rework decode_rle() to support
stepping and offsets.
 2015-05-06 14:27:34 +01:00
Carl Eugen Hoyos
8ad04d24c8 lavf/apngenc: Fix png remuxing by using default extension apng. 2015-05-04 17:49:36 +02:00
Michael Niedermayer
f5b26fbc2f Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2' 
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
  avconv: Add an option for automatically rotating video according to display matrix

Conflicts:
	Changelog
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-02 22:39:00 +02:00
Martin Storsjö
16302246b1 avconv: Add an option for automatically rotating video according to display matrix 
The option is enabled by default, but can be disabled.

If this is enabled, such side data isn't copied into the output stream
(except when doing stream copy).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-02 22:09:06 +03:00
Michael Niedermayer
5a284d076f Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437' 
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:28:13 +02:00
Vittorio Giovara
22526c1f55 Canopus HQ/HQA decoder 
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 22:37:23 +01:00
Paul B Mahol
d2fc702ace avfilter: add chorus filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-04-11 20:39:43 +00:00
Timo Rothenpieler
7b0689c55f avcodec/nvenc: Add options for level and tier 
Previous version reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-09 18:20:26 +02:00
Vignesh Venkatasubramanian
6fd300ac6c lavf: Add support for WebM Live Muxing 
This patch adds support for WebM Live Muxing by adding a new WebM
Chunk muxer. It writes out live WebM Chunks which can be used for
playback using Live DASH Clients.

Please see muxers.texi for sample usage.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-07 15:08:59 +02:00
Andreas Cadhalpun
0224b35c89 avcodec: add unpack packed B-frames bitstream filter 
Fixes Ticket #2913

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-05 02:24:56 +02:00
Donny Yang
80be7daaa8 apng: Add a basic APNG muxer 
Additionally, update some documentation with support for APNG

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 04:52:59 +02:00
Michael Niedermayer
93704e09c7 Merge commit '72025ac36c740f031d7e413041fdfe97087c83c4' 
* commit '72025ac36c740f031d7e413041fdfe97087c83c4':
  lavc: add libdcadec decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/libdcadec.c

See: 519868de7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 13:01:26 +02:00
Michael Niedermayer
268ff17cb7 Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1' 
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
  lavc: add MMAL hardware decoder wrapper

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 11:32:24 +02:00
Hendrik Leppkes
72025ac36c lavc: add libdcadec decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-03-29 10:15:09 +02:00
wm4
c48456166e lavc: add MMAL hardware decoder wrapper 
Based on a patch by Rodger Combs.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-03-29 09:55:20 +02:00
Michael Niedermayer
0a731e4596 Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2' 
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:33:27 +01:00
Anton Khirnov
72b7441a10 lavc: add Intel libmfx-based H.264 encoder 2015-03-27 22:02:10 +01:00
Himangi Saraogi
fff7871772 lavfi: add inverse telecine filter 
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 21:34:03 +01:00
James Almer
23e1303c0a avcodec/nvenc_h265: add missing version bump and changelog entry 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-03-25 03:59:34 -03:00
Timo Rothenpieler
48f7c30bf7 avcodec/nvenc: Drop support for old nvenc api 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 17:25:11 +01:00
James Almer
03e9b1931b avcodec/libdcadec: add missing version bump and changelog entry 2015-03-19 21:09:42 -03:00
Clément Bœsch
304fdfe9f3 lavfi: add showwavespic filter 
This is a variant of showwaves. It is implemented as a different filter
so that the user is not allowed to use meaningless options which belong
to showwaves (such as rate).

Major edits done by Stefano Sabatini, from a patch by ubitux.

See thread:
From: Clément Bœsch <u@pkh.me>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 24 Dec 2014 15:03:26 +0100
Subject: [FFmpeg-devel] [PATCH] avfilter/showwaves: add single_pic option
 2015-03-18 12:19:08 +01:00
Michael Niedermayer
209001073a Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2' 
* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
  dca: Support for XLL (lossless extension)

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/dca.h
	libavcodec/dca_exss.c
	libavcodec/dcadata.h
	libavcodec/dcadec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 22:18:41 +01:00
Niels Möller
217e4ff4d1 dca: Support for XLL (lossless extension) 
Cleanup and integration by Diego Biurrun.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2015-03-15 14:51:36 +01:00
Michael Niedermayer
e1f37c48e5 Merge commit '247e370e2a913db52ca079b347a174c8d393b171' 
* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 23:23:01 +01:00
Vittorio Giovara
247e370e2a TDSC decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-03-13 19:48:14 +00:00