summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '3d8025d602045cbd2894e5182d9243c2e864c8c8'Derek Buitenhuis2016-02-241-1/+1
|\ | | | | | | | | | | | | * commit '3d8025d602045cbd2894e5182d9243c2e864c8c8': profiles: Add missing #endif comment Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * profiles: Add missing #endif commentDiego Biurrun2016-02-181-1/+1
| |
* | Merge commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab'Derek Buitenhuis2016-02-244-53/+1
|\ \ | |/ | | | | | | | | | | * commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab': cosmetics: Drop particularly redundant silly comments Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * cosmetics: Drop particularly redundant silly commentsDiego Biurrun2016-02-184-53/+1
| |
* | Merge commit '29c2d06d67724e994980045afa055c6c34611b30'Derek Buitenhuis2016-02-2447-59/+1
|\ \ | |/ | | | | | | | | | | * commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * cosmetics: Drop empty comment linesDiego Biurrun2016-02-1850-66/+1
| |
* | Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'Derek Buitenhuis2016-02-241-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c': hwcontext_cuda/vdpau: add to skipheaders Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * hwcontext_cuda/vdpau: add to skipheadersAnton Khirnov2016-02-181-0/+2
| |
* | Merge commit '9c0bc1e980a99106d6749ec632f166b87275871e'Derek Buitenhuis2016-02-241-0/+2
|\ \ | |/ | | | | | | | | | | * commit '9c0bc1e980a99106d6749ec632f166b87275871e': qsv: add a missing #include Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsv: add a missing #includeAnton Khirnov2016-02-181-0/+2
| | | | | | | | Needed for enum AVCodecID
* | Merge commit 'b92962436bdcfae478c8598dca397a397762eef8'Derek Buitenhuis2016-02-241-2/+3
|\ \ | |/ | | | | | | | | | | * commit 'b92962436bdcfae478c8598dca397a397762eef8': mov: Fix the format specifier type for size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Fix the format specifier type for sizeVittorio Giovara2016-02-161-2/+3
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '2edc718723b60530aead26c20cbc891102f7d529'Derek Buitenhuis2016-02-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | This is a no-op. This was a part of the already-reverted broken configure saga. * commit '2edc718723b60530aead26c20cbc891102f7d529': configure: Relax the implication of --enable for components Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * configure: Relax the implication of --enable for componentsLuca Barbato2016-02-151-1/+2
| | | | | | | | | | | | Do not error out if some subcomponents cannot be enabled. Reported-By: RT|AO
* | Merge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'Derek Buitenhuis2016-02-242-4/+4
|\ \ | |/ | | | | | | | | | | * commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c': fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefsDiego Biurrun2016-02-152-4/+4
| | | | | | | | Also fix #endif comments in the FFT init code.
* | Merge commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1'Derek Buitenhuis2016-02-241-0/+6
|\ \ | |/ | | | | | | | | | | * commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1': avconv: pass the hw context from filters to the encoder Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avconv: pass the hw context from filters to the encoderAnton Khirnov2016-02-141-0/+6
| |
* | Merge commit '871d0930d4c8666df5514093beff874acbe5cce0'Derek Buitenhuis2016-02-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | Timo is going to implement this for us. * commit '871d0930d4c8666df5514093beff874acbe5cce0': nvenc: support CUDA frames as input Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * nvenc: support CUDA frames as inputAnton Khirnov2016-02-142-62/+238
| |
* | Merge commit '7b3214d0050613bd347a2e41c9f78ffb766da25e'Derek Buitenhuis2016-02-244-2/+30
|\ \ | |/ | | | | | | | | | | * commit '7b3214d0050613bd347a2e41c9f78ffb766da25e': lavc: add a field for passing AVHWFramesContext to encoders Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: add a field for passing AVHWFramesContext to encodersAnton Khirnov2016-02-144-1/+29
| |
* | Merge commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8'Derek Buitenhuis2016-02-245-0/+247
|\ \ | |/ | | | | | | | | | | * commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8': lavfi: add a filter for uploading normal frames to CUDA Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavfi: add a filter for uploading normal frames to CUDAAnton Khirnov2016-02-145-0/+251
| |
* | Merge commit '1bf34134612e509fa68c70dfff418c6022459259'Derek Buitenhuis2016-02-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | This commit is a no-op. * commit '1bf34134612e509fa68c70dfff418c6022459259': avconv: use the new buffersrc parameters API Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avconv: use the new buffersrc parameters APIAnton Khirnov2016-02-142-22/+50
| | | | | | | | | | | | | | The timebase change in the zmbv-8bit test is due to the fact that previously the timebase string was evaluated as floating point, then converted to a rational. After this commit, the timebase is passed directly as is.
* | Merge commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3'Derek Buitenhuis2016-02-247-3/+174
|\ \ | |/ | | | | | | | | | | * commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3': lavfi: pass the hw frames context through the filter chain Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavfi: pass the hw frames context through the filter chainAnton Khirnov2016-02-147-10/+191
| |
* | Merge commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073'Derek Buitenhuis2016-02-247-0/+325
|\ \ | |/ | | | | | | | | | | * commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073': hwcontext: add a CUDA implementation Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * hwcontext: add a CUDA implementationAnton Khirnov2016-02-147-0/+325
| |
* | Merge commit '7bc780cd4413f688d3b834037b0f9ddfd6948140'Derek Buitenhuis2016-02-243-0/+11
|\ \ | |/ | | | | | | | | | | * commit '7bc780cd4413f688d3b834037b0f9ddfd6948140': pixfmt: add a CUDA hwaccelled format Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * pixfmt: add a CUDA hwaccelled formatAnton Khirnov2016-02-143-0/+11
| |
* | configure: Allow linking to CUDA dynamically instead of dlopen()ing it at ↵Anton Khirnov2016-02-241-0/+4
| | | | | | | | | | | | | | | | | | runtime This currently doesn't do anything, but will be used later for hwaccel filters and libavutil. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | img2dec: Support Progressive JPEG in jpeg_probeJustin Ruggles2016-02-241-1/+1
| | | | | | | | | | | | There can be multiple SOS markers, so do not return 0 in that case. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de'Derek Buitenhuis2016-02-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | This commit is a no-op. We already have such functionality. * commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de': Allow linking to CUDA dynamically instead of dlopen()ing it at runtime Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Allow linking to CUDA dynamically instead of dlopen()ing it at runtimeAnton Khirnov2016-02-143-1/+22
| |
* | avcodec/mpeg12dec: Fix missing slice handling without paddingMichael Niedermayer2016-02-241-3/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Add GBRAP12 pixel formatKieran Kunhya2016-02-247-1/+50
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/utvideodec: prevent possible signed overflowGanesh Ajjanagadde2016-02-231-2/+2
| | | | | | | | | | | | | | | | Doing slice_end - slice_start is unsafe and can lead to undefined behavior until slice_end has been properly sanitized. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com>
* | swscale/utils: Fix chrSrcHSubSample for GBRAP16Michael Niedermayer2016-02-241-0/+1
| | | | | | | | | | | | Fixes part of Ticket5264 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/input: Fix GBRAP16 inputMichael Niedermayer2016-02-241-0/+20
| | | | | | | | | | | | Fixes part of Ticket5264 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/lavf: transmit stream_id information for mpegts KLV data packetsStefano Sabatini2016-02-238-104/+147
| | | | | | | | | | | | | | | | | | | | | | | | This allows to copy information related to the stream ID from the demuxer to the muxer, thus allowing for example to retain information related to synchronous and asynchronous KLV data packets. This information is used in the muxer when remuxing to distinguish the two kind of packets (if the information is lacking, data packets are considered synchronous). The fate reference changes are due to the use of av_packet_merge_side_data(), which increases the size of the output packet size, since side data is merged into the packet data.
* | lavf/riffenc: Handle AV_PIX_FMT_MONOBLACKMats Peterson2016-02-231-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/avf_showcqt: use lrintMuhammad Faiz2016-02-231-45/+45
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | postproc: fix unaligned accessCarl Eugen Hoyos2016-02-231-1/+1
| | | | | | | | | | Based on 59074310 by Andreas Cadhalpun. Fixes ticket #5259.
* | libvpxenc: quiet unused-variable warningJames Zern2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | with older versions of libvpx since: 432be63 lavc/libvpx: Fix support for RGB colorspace. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: James Zern <jzern@google.com>
* | x86/dcadec: add ff_lfe_fir1_float_{sse3,avx}James Almer2016-02-222-1/+87
| | | | | | | | | | Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | lavfi/nnedi: Fix a compilation warning.Carl Eugen Hoyos2016-02-231-1/+1
| | | | | | | | | | Silences the following warning: libavfilter/vf_nnedi.c:611:15: warning: assignment discards ‘const’ qualifier from pointer target type
* | lavfi/nnedi: Fix a memleak.Carl Eugen Hoyos2016-02-231-0/+1
| |
* | avfilter/avf_showcqt: remove unneeded headersMuhammad Faiz2016-02-231-3/+0
| |
View Lorry Controller Status