summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* asm: FF_-prefix internal macros used in inline assemblyMatthieu Bouron2016-06-27
| | | | See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
* Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'Matthieu Bouron2016-06-27
|\ | | | | | | | | | | | | | | | | | | * commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e': asm: FF_-prefix internal macros used in inline assembly This commit is a noop as the ASM codebase differs too much between libav and ffmpeg. The corresponding chunks will be found in the next commit. Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| * asm: FF_-prefix internal macros used in inline assemblyDiego Biurrun2016-05-28
| | | | | | | | | | These warnings conflict with system macros on Solaris, producing truckloads of warnings about macro redefinition.
* | avformat/mov: parse rtmd track timecodePaul B Mahol2016-06-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avdevice/decklink: fix mingw portabilityMarton Balint2016-06-27
| | | | | | | | | | | | Fixes ticket #5669. Signed-off-by: Marton Balint <cus@passwd.hu>
* | configure: use c++98 for c++ filesRick Kern2016-06-26
| | | | | | | | | | | | | | Use c++98 standard instead of c++11. Signed-off-by: Rick Kern <kernrj@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate/webp : add test for webp lossless decoding (rgb and rgba)Martin Vignali2016-06-26
| | | | | | | | | | | | output have been compared with official decoding tool output (dwebp) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate/exr : add tests for file with half and float channelsMartin Vignali2016-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | changelog: fix entry orderJames Almer2016-06-26
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Update FFmpeg 3.1 cut markerJames Almer2016-06-26
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avdevice/decklink: add support for setting input packet timestamp sourceMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: add support for audio and video input selectionMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: add support for setting duplex modeMarton Balint2016-06-26
| | | | | | | | | | | | | | This patch also makes BlackMagic drivers v10.6.1 a hard requirement. Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: always free decklink resources on errorMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: factorize device finder functionMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: remove unused itermode iteratorsMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: factorize cleanup function to common codeMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink_dec: fix bitrate calculationsMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avcodec/libopenjpegenc: Set numresolutions by default to a value that is not ↵Michael Niedermayer2016-06-26
| | | | | | | | | | | | | | | | too large Fixes issues with libopenjpeg 2.1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit 'dc40a70c5755bccfb1a1349639943e1f408bea50': Drop unnecessary libavutil/x86/asm.h #includes Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * Drop unnecessary libavutil/x86/asm.h #includesDiego Biurrun2016-05-28
| |
* | Merge commit '5264e7ba217b3c0ceae813917134e1ab52573141'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | | | | | * commit '5264e7ba217b3c0ceae813917134e1ab52573141': ac3: Check the array bound before dereferencing See d85ebea3f3b68ebccfe308fa839fc30fa634e4de Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * ac3: Check the array bound before dereferencingLuca Barbato2016-05-27
| | | | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84': vaapi_h264: Add trivial support for low-power encoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vaapi_h264: Add trivial support for low-power encodingMark Thompson2016-05-27
| | | | | | | | | | | | Experimental; requires Skylake and VAAPI 0.39.1 (not yet released). Also increases the allowed range of the quality option - in low-power mode, the Intel driver supports levels 1-8 (and 0 meaning default).
* | Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b': vaapi_h264: Fix frame_num after non-reference frames Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vaapi_h264: Fix frame_num after non-reference framesMark Thompson2016-05-27
| | | | | | | | | | | | | | Non-reference frames (nal_ref_idc == 0) should be discardable, so frame_num does not advance after them. Before this change, a stream containing unreferenced B-frames would be rejected by the reference decoder.
* | Merge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32': vaapi_encode: Check config attributes before creating config Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vaapi_encode: Check config attributes before creating configMark Thompson2016-05-27
| | | | | | | | | | | | This prevents attempts to use unsupported modes, such as low-power H.264 mode on non-Skylake targets. Also fixes a crash on invalid configuration, when trying to destroy an invalid VA config/context.
* | Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit '6641819feedb086ebba3d2be89b8d33980f367e1': build: Ignore generated mapfile and remove it on distclean Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * build: Ignore generated mapfile and remove it on distcleanDiego Biurrun2016-05-27
| |
* | Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit 'f5c43884190be094749acfba104e3eab98d8ff1e': FATE: drop the audio stream from the dxtory test Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * FATE: drop the audio stream from the dxtory testAnton Khirnov2016-05-26
| | | | | | | | | | This is a video test and there are no audio packets in the sample anyway.
* | Merge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | | | | | * commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e': avconv: fix parsing bitstream filters Not merged because ffmpeg_opt.c still uses the old BSF API. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: fix parsing bitstream filtersAnton Khirnov2016-05-26
| | | | | | | | | | | | The current code modifies the user-supplied string, which is shared for the whole output file. So a bitstream filter specification applied to multiple streams would not work correctly.
* | Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit '80fb19bc234a3f2350d891adf39f3738a8e4849f': avconv: fix a check for av_bsf_get_by_name() return value Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: fix a check for av_bsf_get_by_name() return valueAnton Khirnov2016-05-26
| |
* | Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit '9f7590f4e497c12693247d7f935a20d7773a64dd': avconv_vaapi: use the hwcontext device creation API Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv_vaapi: use the hwcontext device creation APIAnton Khirnov2016-05-26
| |
* | hwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindowHendrik Leppkes2016-06-26
| | | | | | | | | | Improves compatibility with some MinGW variants, see 771537edcf703434161c100e6898891546d1d4b3
* | Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit '18c506e9e6e8df8b1d496d093077b8240ea68c28': avconv_dxva2: use the hwcontext device creation API Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv_dxva2: use the hwcontext device creation APIAnton Khirnov2016-05-26
| |
* | Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6': avconv_vdpau: use the hwcontext device creation API Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv_vdpau: use the hwcontext device creation APIAnton Khirnov2016-05-26
| |
* | Merge commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa': hwcontext_vaapi: implement device creation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hwcontext_vaapi: implement device creationAnton Khirnov2016-05-26
| |
* | Merge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded': hwcontext_dxva2: implement device creation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hwcontext_dxva2: implement device creationAnton Khirnov2016-05-26
| |
* | Merge commit '2e219b491bcc0845248345fdad31231b081e06d1'Hendrik Leppkes2016-06-26
|\| | | | | | | | | | | | | * commit '2e219b491bcc0845248345fdad31231b081e06d1': hwcontext_cuda: implement device creation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hwcontext_cuda: implement device creationAnton Khirnov2016-05-26
| |