summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf'Clément Bœsch2017-03-19
|\ | | | | | | | | | | | | * commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf': mpeg4videoenc: Kill non-compiling disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
| * mpeg4videoenc: Kill non-compiling disabled cruftDiego Biurrun2016-08-17
| |
* | Merge commit 'e4d5b55193109d08be47c42d320334546c006b51'Clément Bœsch2017-03-19
|\| | | | | | | | | | | | | * commit 'e4d5b55193109d08be47c42d320334546c006b51': rangecoder: Kill non-compiling disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
| * rangecoder: Kill non-compiling disabled cruftDiego Biurrun2016-08-17
| |
* | swresample/x86/resample: extend resample_double to support avx and fma3Muhammad Faiz2017-03-19
| | | | | | | | | | | | | | | | | | benchmark: sse2 10.670s avx 8.763s fma3 8.380s Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | Merge commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815': mathematics: Kill non-compiling disabled cruft This commit is a noop, see 1e1513d01aa8296d55efab95143e65ccbb152c5f Merged-by: Clément Bœsch <u@pkh.me>
| * mathematics: Kill non-compiling disabled cruftDiego Biurrun2016-08-17
| |
* | lavu/mathematics: split closing bracket out of ifdeferyClément Bœsch2017-03-18
| |
* | lavu/mathematics: document so-called "cruft"Clément Bœsch2017-03-18
| |
* | Merge commit '5a667322f5cb0e77c15891fc06725c19d8f3314f'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '5a667322f5cb0e77c15891fc06725c19d8f3314f': vaapi_vc1: Remove redundant version check This commit is a noop, see d07d01bcce4dd145d04bd936b5d2d268ed688e3f Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_vc1: Remove redundant version checkMark Thompson2016-08-13
| | | | | | | | | | The lowest supported VAAPI version is 0.34 (checked at configure time), so this test is no longer needed.
* | Merge commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d': vaapi_vc1: Constify pointers This commit is a noop, see 845c2c140b5ec9774dba5d92459b581eba79a788 Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_vc1: Constify pointersMark Thompson2016-08-13
| |
* | Merge commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29': vaapi_mpeg2: Constify pointers This commit is a noop, see 6bc2808c41a3f1c7fb7655fc4835d74fdcf87464 Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_mpeg2: Constify pointersMark Thompson2016-08-13
| |
* | Merge commit '03adfe913062c6995136eb1ca51152b6d596c0f4'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '03adfe913062c6995136eb1ca51152b6d596c0f4': vaapi_h264: Constify pointers This commit is a noop, see d0897da924509736849408cbbbc20ba42ea092bd Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_h264: Constify pointersMark Thompson2016-08-13
| |
* | Merge commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f': hwcontext_vaapi: Try the first render node as the default DRM device This commit is a noop, see 8d47d8407569aade0c0d564600919349789dc38b Merged-by: Clément Bœsch <u@pkh.me>
| * hwcontext_vaapi: Try the first render node as the default DRM deviceMark Thompson2016-08-13
| | | | | | | | | | | | | | | | | | | | If no string argument is supplied when av_hwdevice_ctx_create() is called to create a VAAPI device, we currently only try the default X11 display (that is, $DISPLAY) to find a device, and will therefore fail in the absence of an X server to connect to. Change the logic to also look for a device via the first DRM render node (that is, "/dev/dri/renderD128"), which is probably the right thing to use in most simple configurations which only have one DRM device.
* | Merge commit '6fc944e6136b050bf965f847bbfd69e1fe572f82'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '6fc944e6136b050bf965f847bbfd69e1fe572f82': Prepare for 12_alpha1 Release This commit is a noop. Merged-by: Clément Bœsch <u@pkh.me>
| * Prepare for 12_alpha1 ReleaseSean McGovern2016-08-12
| |
* | Merge commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5': avconv: Make sure that inputless filtergraphs are configured This commit is a noop. Related code is pretty different in ffmpeg, and -filter_complex testsrc works. See also af1761f7b5b1b72197dc40934953b775c2d951cc Merged-by: Clément Bœsch <u@pkh.me>
| * avconv: Make sure that inputless filtergraphs are configuredLuca Barbato2016-08-12
| | | | | | | | | | | | Unbreak `avconv -filter_complex testsrc`. Regression introduced in a3a0230a9870b9018dc7415ae5872784d524cfe5
* | Merge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '602abe77b02f9702c18c2787d208fcfc9d94b70f': avconv: Check the fifo allocation This commit is a noop, see af1761f7b5b1b72197dc40934953b775c2d951cc Merged-by: Clément Bœsch <u@pkh.me>
| * avconv: Check the fifo allocationLuca Barbato2016-08-12
| |
* | Merge commit 'f2143c57b6a61fef382f3128138d8558a9bdecee'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2143c57b6a61fef382f3128138d8558a9bdecee': vp9: reindent after last commit vp9: add frame threading vp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically. vp9: split last/cur_frame from the reference buffers. This commit is a noop, we already have all these changes. Again, we will need in the future to analyse the tiny differences between the two repository on the vp9 files. But in the current state, it's a real pain to do at every commit due to the huge differences (such as files split and cosmetics). Merged-by: Clément Bœsch <u@pkh.me>
| * vp9: reindent after last commitAnton Khirnov2016-08-11
| |
| * vp9: add frame threadingRonald S. Bultje2016-08-11
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically.Ronald S. Bultje2016-08-11
| | | | | | | | | | | | This will be needed for frame threading. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9: split last/cur_frame from the reference buffers.Ronald S. Bultje2016-08-11
| | | | | | | | | | | | | | | | | | | | We need more information from last/cur_frame than from reference buffers, so we can use a simplified structure for reference buffers, and then store mvs and segmentation map information in last/cur. This prepares the decoder for frame threading support. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '04763c6f87690b31cfcd0d324cf36a451531dcd0'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | * commit '04763c6f87690b31cfcd0d324cf36a451531dcd0': h264_direct: use the reference mask from the actual reference This commit is a noop, see d8151a7e944aea52d167571badc247c8d9972847 Merged-by: Clément Bœsch <u@pkh.me>
| * h264_direct: use the reference mask from the actual referenceAnton Khirnov2016-08-11
| | | | | | | | | | | | | | | | Not from the underlying frame. Fixes races with frame threading in field-coded files, where decoding would wait for the wrong field (e.g. random failures in mixed-nal-coding). Bug-Id: 954
* | Merge commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225': lavc: free buffer_frame/pkt on avcodec_open2() failure This commit is a noop, see 27adf9f9cdbc6f1dc0a1292dc97490eec6f2f068. Only reordered to reduce diff. Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: free buffer_frame/pkt on avcodec_open2() failureAnton Khirnov2016-08-11
| | | | | | | | Fixes memory leaks in some FATE tests.
* | Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'Clément Bœsch2017-03-18
|\| | | | | | | | | | | | | * commit 'ec021d48445a414325ad59a73f9cde3212b173e4': buffer: fix av_buffer_pool_init2() documentation Merged-by: Clément Bœsch <u@pkh.me>
| * buffer: fix av_buffer_pool_init2() documentationAnton Khirnov2016-08-11
| | | | | | | | | | | | A non-existent av_buffer_pool_can_uninit() function is mentioned instead of av_buffer_pool_uninit(). Also, this function is to be called by the caller, not the pool itself.
* | compat/atomics/gcc: use __typeof__ instead of typeofJames Almer2017-03-18
| | | | | | | | | | | | | | | | | | The typeof keyword is apparently not available when using the -std=c99 option. Fixes the use of C11 atomic functions with old GCC. Reviewed-by: Muhammad Faiz <mfcc64@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | lavfi: deprecate AVFilterGraph->resample_lavr_optsRostislav Pehlivanov2017-03-18
| | | | | | | | | | | | | | Not used by anything at all since we don't auto insert lavr filters. Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | swresample/swresample: do not use s32p internally by default when resamplingMuhammad Faiz2017-03-18
| | | | | | | | | | | | | | | | | | | | | | | | use fltp when doing s32 -> s32 resampling because s32p has no simd optimization benchmark: old 17.913s new 7.584s (use fma3) Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | lavc/avcodec: Constify AVBitStreamFilter* in AVBitStreamFilterContext struct.Carl Eugen Hoyos2017-03-17
| | | | | | | | | | Fixes a gcc warning: libavcodec/bitstream_filter.c:71:20: warning: assignment discards 'const' qualifier from pointer target type
* | mov: Drop extra format specifier in error messageVittorio Giovara2017-03-17
| |
* | spherical: Change types of bounding and pad to uint32_tVittorio Giovara2017-03-17
| | | | | | | | | | | | | | | | | | These values are defined to be 32bit in the specification, so it makes more sense to store them as fixed width. Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | fate: Do not report side data sizeVittorio Giovara2017-03-17
| | | | | | | | | | | | | | This field is of little value, and interferes with testing side data, since sizes can be different on multiple architectures. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0638b99cdba52554691fc668d9e477bc184c7a33'Matthieu Bouron2017-03-17
|\| | | | | | | | | | | | | | | | | | | * commit '0638b99cdba52554691fc668d9e477bc184c7a33': aiff: Skip padding byte for odd-sized chunks Also removes to odd-size checks from get_aiff_header and get_meta to use the generic path introduced by the original commit. Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
| * aiff: Skip padding byte for odd-sized chunksDiego Biurrun2016-08-10
| | | | | | | | Bug-Id: 660
* | avcodec: estimate output bitrate for uncompressed video codecsTobias Rapp2017-03-17
| | | | | | | | | | | | | | | | | | | | | | Allows to get a more realistic total bitrate (and estimated file size) in avi_write_header. Previously a static default value of 200k was assumed. Adds an internal helper function for bitrate guessing. Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: set the encoding framerate when the output is CFRAnton Khirnov2017-03-17
| | | | | | | | | | | | (cherry picked from Libav commit d10102d23c9467d4eb84f58e0cd12be284b982f6) Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
* | avcodec/nvenc: allow different const-qps for I, P and B framesKonda Raju2017-03-17
| | | | | | | | Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* | swresample/resample: do not assert compensation_distance on rebuild_filterMuhammad Faiz2017-03-17
| | | | | | | | | | | | | | | | | | | | | | | | when set_compensation is called with zero sample_delta, compensation does not happen (because dst_incr == ideal_dst_incr) but compensation_distance is set regression since 01ebb57c03abde89bca7bdbc552917efcb8f551d Found-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avcodec: fix uninitialized variable readwm42017-03-17
| | | | | | | | | | | | | | This cna happen if the user tries to call the new decode API for subtitles. Fixes CID 1402071.