summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * msmpeg4data: K&R formatting cosmeticsDiego Biurrun2016-02-191-1817/+1793
| |
* | Merge commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac'Derek Buitenhuis2016-02-241-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac': build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Add missing mpegvideo dependency for the MSS2 and VC-1 decodersDiego Biurrun2016-02-191-2/+2
| |
* | Merge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba'Derek Buitenhuis2016-02-241-1/+2
|\ \ | |/ | | | | | | | | | | * commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba': build: More precise dependencies for h264dsp Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: More precise dependencies for h264dspDiego Biurrun2016-02-191-1/+2
| |
* | Merge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35'Derek Buitenhuis2016-02-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | This commit is a no-op. We already set this. * commit 'f273f7fb25b68792be481c9241b0ec2876e41f35': mkv: Force the full parsing of mp3 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mkv: Force the full parsing of mp3Luca Barbato2016-02-191-0/+2
| | | | | | | | | | | | | | Some muxer might or might not fit incomplete mp3 frames in their packets. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'Derek Buitenhuis2016-02-241-0/+3
|\ \ | |/ | | | | | | | | | | * commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0': mov: Force the full parsing of mp3 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Force the full parsing of mp3Luca Barbato2016-02-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | Some muxer might or might not fit incomplete mp3 frames in their packets. Bug-Id: 899 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c'Derek Buitenhuis2016-02-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | This commit is a no-op. We have already reverted the configure changes, and we do not have a typo in configure. * commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c': Revert all recent configure changes related to dependency resolution build: Fix typo in HEVC VDPAU hwaccel dependencies Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Revert all recent configure changes related to dependency resolutionDiego Biurrun2016-02-191-63/+14
| | | | | | | | This reverts commits 2edc718723b6, a2bb771a3cde, 21c750f240b9, 8e7bea6dc6ac.
| * build: Fix typo in HEVC VDPAU hwaccel dependenciesDiego Biurrun2016-02-181-1/+1
| |
* | Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'Derek Buitenhuis2016-02-243-122/+144
|\ \ | |/ | | | | | | | | | | * commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364': voc: Split ff_voc_get_packet into a separate file Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * voc: Split ff_voc_get_packet into a separate fileDiego Biurrun2016-02-183-103/+122
| |
* | Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310'Derek Buitenhuis2016-02-243-27/+26
|\ \ | |/ | | | | | | | | | | * commit '624e235502c5aa2d17e22dd6c0ccdf080a177310': build: Introduce iso_media component Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Introduce iso_media componentDiego Biurrun2016-02-183-26/+26
| |
* | Merge commit '82454c3a826bc8aa42474097784b70befd5be532'Derek Buitenhuis2016-02-243-8/+7
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '82454c3a826bc8aa42474097784b70befd5be532': build: Let the WTV demuxer select the MPEG-TS demuxer build: Adjust mpeg4video parser dependencies build: Fix mpegvideo component dependencies build: Fix dependencies for components relying on H.263 data tables Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Let the WTV demuxer select the MPEG-TS demuxerDiego Biurrun2016-02-183-3/+2
| | | | | | | | | | The WTV demuxer depends on large parts of the MPEG-TS demuxer internals anyway and fails to build without it.
| * build: Adjust mpeg4video parser dependenciesDiego Biurrun2016-02-181-1/+1
| |
| * build: Fix mpegvideo component dependenciesDiego Biurrun2016-02-181-1/+1
| |
| * build: Fix dependencies for components relying on H.263 data tablesDiego Biurrun2016-02-181-3/+3
| |
* | Merge commit 'e453129321778886813dcecf73c8b42f8352ca0e'Derek Buitenhuis2016-02-241-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'e453129321778886813dcecf73c8b42f8352ca0e': build: Add missing dependencies for eatqi decoder Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Add missing dependencies for eatqi decoderDiego Biurrun2016-02-181-1/+1
| |
* | Merge commit '71eaefa64a54bece571299ca600d06f48ac7c6c3'Derek Buitenhuis2016-02-240-0/+0
|\ \ | |/ | | | | | | | | | | * commit '71eaefa64a54bece571299ca600d06f48ac7c6c3': build: Add missing celp_math dependency for G723_1 encoder and decoder Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Add missing celp_math dependency for G723_1 encoder and decoderVittorio Giovara2016-02-181-2/+4
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f'Derek Buitenhuis2016-02-241-1/+1
|\ \ | |/ | | | | | | | | | | * commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f': checkasm: Use standard multiple inclusion guards Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * checkasm: Use standard multiple inclusion guardsDiego Biurrun2016-02-181-3/+3
| |
* | 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>
OpenPOWER on IntegriCloud