summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* lavfi/subtitles: fix memleak after 6bcb1e1aClément Bœsch2016-06-25
| | | | Spotted-by: James Almer <jamrial@gmail.com>
* avcodec/omx: fix deprecation warning for ff_alloc_packetAman Gupta2016-06-25
| | | | | Tested-by: Jan Gerber <j@v2v.cc> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/exr: add missed hunks from previous exr commitMartin Vignali2016-06-25
|
* avcodec/exr: fix reading float channel when there is half and float channels ↵Martin Vignali2016-06-25
| | | | in a file
* lavfi/subtitles: switch to codecparClément Bœsch2016-06-25
|
* avformat/movenc: add option to use keys/mdta atoms for metadataDavid Murmann2016-06-25
| | | | | | | | Add -movflags use_metadata_tags to the mov muxer. This will cause the muxer to write all metadata to the file in the keys and mtda atoms. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/neontest: fix constness in arm/aarch64 avcodec_open2() wrappersClément Bœsch2016-06-25
|
* lavf/utils: fix const warning at a find_decoder() callClément Bœsch2016-06-25
|
* ffmpeg: do not use deprecated AVSubtitleRect.pictClément Bœsch2016-06-25
|
* Merge commit '3399a26d3f57d462e839c0ee51223ae9aca20852'Clément Bœsch2016-06-25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3399a26d3f57d462e839c0ee51223ae9aca20852': nvenc: allow setting the number of slices nvenc: De-compensate aspect ratio compensation of DVD-like content. nvenc: list the major contributors in the copyright header configure: Don't require nonfree for nvenc nvenc: drop the hard dependency on CUDA nvenc: only support HW frames when CUDA is enabled nvenc: write the VUI signal properties for HEVC nvenc: only write the VUI signal type fields if they are set nvenc: Generate bufferingPeriod/pictureTiming SEI nvenc: Delay frame output to increase encoding speed nvenc: add support for lossless encoding nvenc: Generate AUD NAL units for better compatiblity nvenc: fix the rc option definitions All these commits are noop as requested by Timo Rothenpieler. <BtbN> andrey_turkin, ubitux, yeah, I like the current state of nvenc in ffmpeg, I think most remaining differences should be merged on the libav side of things. At least I'm not aware of anything that's missing in ffmpeg. Merged-by: Clément Bœsch <u@pkh.me>
| * nvenc: allow setting the number of slicesAnton Khirnov2016-05-19
| | | | | | | | Based on a patch by Agatha Hu <ahu@nvidia.com>
| * nvenc: De-compensate aspect ratio compensation of DVD-like content.Philip Langdale2016-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reasons we are not privy to, nvidia decided that the nvenc encoder should apply aspect ratio compensation to 'DVD like' content, assuming that the content is not BT.601 compliant, but needs to be BT.601 compliant. In this context, that means that they make the following, questionable, assumptions: 1) If the input dimensions are 720x480 or 720x576, assume the content has an active area of 704x480 or 704x576. 2) Assume that whatever the input sample aspect ratio is, it does not account for the difference between 'physical' and 'active' dimensions. From these assumptions, they then conclude that they can 'help', by adjusting the sample aspect ratio by a factor of 45/44. And indeed, if you wanted to display only the 704 wide active area with the same aspect ratio as the full 720 wide image - this would be the correct adjustment factor, but what if you don't? And more importantly, what if you're used to lavc not making this kind of adjustment at encode time - because none of the other encoders do this! And, what if you had already accounted for BT.601 and your input had the correct attributes? Well, it's going to apply the compensation anyway! So, if you take some content, and feed it through nvenc repeatedly, it will keep scaling the aspect ratio every time, stretching your video out more and more and more. So, clearly, regardless of whether you want to apply bt.601 aspect ratio adjustments or not, this is not the way to do it. With any other lavc encoder, you would do it as part of defining your input parameters or do the adjustment at playback time, and there's no reason by nvenc should be any different. This change adds some logic to undo the compensation that nvenc would otherwise do. nvidia engineers have told us that they will work to make this compensation mechanism optional in a future release of the nvenc SDK. At that point, we can adapt accordingly. Signed-off-by: Philip Langdale <philipl@overt.org> Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * nvenc: list the major contributors in the copyright headerAnton Khirnov2016-05-19
| |
| * configure: Don't require nonfree for nvencTimo Rothenpieler2016-05-19
| | | | | | | | | | | | | | | | As the nvEncodeApi.h header is now MIT licensed, this can be dropped. The loaded CUDA and NVENC libraries are part of the nvidia driver, and thus count as system libraries. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * nvenc: drop the hard dependency on CUDAAnton Khirnov2016-05-19
| | | | | | | | | | | | | | | | The code needs only a few definitions from cuda.h, so define them directly when CUDA is not enabled. CUDA is still required for accepting HW frames as input. Based on the code by Timo Rothenpieler <timo@rothenpieler.org>.
| * nvenc: only support HW frames when CUDA is enabledAnton Khirnov2016-05-19
| | | | | | | | | | hwcontext_cuda.h includes cuda.h, so this will allow building nvenc without depending on cuda.h
| * nvenc: write the VUI signal properties for HEVCAnton Khirnov2016-05-19
| | | | | | | | | | | | Bump the API version requirement to 6. Based on a patch by Agatha Hu <ahu@nvidia.com>.
| * nvenc: only write the VUI signal type fields if they are setAnton Khirnov2016-05-19
| | | | | | | | Based on a patch by Agatha Hu <ahu@nvidia.com>.
| * nvenc: Generate bufferingPeriod/pictureTiming SEITimo Rothenpieler2016-05-19
| | | | | | | | | | | | | | For some unknown reason enabling these causes proper CBR padding, so as there are no known downsides just always enable them in CBR mode. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * nvenc: Delay frame output to increase encoding speedTimo Rothenpieler2016-05-19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * nvenc: add support for lossless encodingAnton Khirnov2016-05-19
| | | | | | | | Based on a patch by Philip Langdale <philipl@overt.org>
| * nvenc: Generate AUD NAL units for better compatiblityTimo Rothenpieler2016-05-19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * nvenc: fix the rc option definitionsAnton Khirnov2016-05-19
| |
* | Merge commit '65dc7ca4c8e7e56362626a5d31e563e80108f104'Clément Bœsch2016-06-25
|\| | | | | | | | | | | | | | | | | | | * commit '65dc7ca4c8e7e56362626a5d31e563e80108f104': Add release notes for 12. This commit is a noop, but we absolutely need someone to write the release notes. Merged-by: Clément Bœsch <u@pkh.me>
| * Add release notes for 12.Anton Khirnov2016-05-19
| |
* | Merge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7'Clément Bœsch2016-06-25
|\| | | | | | | | | | | | | * commit 'd68fb1475856cf93199e2bc4eee3063902c35df7': mjpegdec: Properly fail on malloc failure Merged-by: Clément Bœsch <u@pkh.me>
| * mjpegdec: Properly fail on malloc failureDerek Buitenhuis2016-05-19
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'Clément Bœsch2016-06-25
|\| | | | | | | | | | | | | * commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a': configure: move the hardware accel libs' entries in the configure output Merged-by: Clément Bœsch <u@pkh.me>
| * configure: move the hardware accel libs' entries in the configure outputAnton Khirnov2016-05-19
| | | | | | | | | | Print them as a subsection of the external library section, in line with what is done for the help text in the previous commit.
* | Merge commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d'Clément Bœsch2016-06-25
|\| | | | | | | | | | | | | * commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d': configure: move the hardware accel libs' entries in the help text Merged-by: Clément Bœsch <u@pkh.me>
| * configure: move the hardware accel libs' entries in the help textAnton Khirnov2016-05-19
| | | | | | | | | | | | | | | | | | Group them in a subsection of the external library section. That should make them easier to find and understand how they fit in the scheme of things. Also, rewrite the description text in a similar way as in the previous commit.
* | Merge commit '5e2203448ab4cc8ea1d933b87f1b39b009201044'Clément Bœsch2016-06-25
|\| | | | | | | | | | | | | | | | | | | | | * commit '5e2203448ab4cc8ea1d933b87f1b39b009201044': configure: improve the help text for external libraries Only merged the explanation paragraphs. The removal of "enable/disable" and "[no]" would create too much inconsistency and might cause confusion. Merged-by: Clément Bœsch <u@pkh.me>
| * configure: improve the help text for external librariesAnton Khirnov2016-05-19
| | | | | | | | | | | | | | | | | | Add a more accurate description of what the switches actually do (i.e. allow using the given library, not enabling the corresponding codecs etc.). Replace the library descriptions, in many cases boilerplate text without useful information, with a short summary of what the library does.
* | Merge commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c'Clément Bœsch2016-06-25
|\| | | | | | | | | | | | | * commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c': lavc: revert the Makefile part of 330177b Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: revert the Makefile part of 330177bAnton Khirnov2016-05-19
| | | | | | | | | | | | | | There is no real advantage to listing some codecs or subsystems separately simply because they are somehow "hw-accelerated", on the contrary it makes them harder to find than in a plain alphabetically ordered list.
* | movenc: mark astronomical_body const string as staticClément Bœsch2016-06-25
| |
* | lavd/decklink: Fix compile issue on OS XRick Kern2016-06-24
| | | | | | | | | | | | | | Fixes #4124: Invalid argument '-std=c99' not allowed with 'C++/ObjC++' C++ files fail to compile. This adds '-std=c++11' to CXX_FLAGS to fix. Signed-off-by: Rick Kern <kernrj@gmail.com>
* | avcodec/ppc: fix broken build when compiling libavcodec with LLVM on PPC backendJing Yu2016-06-25
| | | | | | | | | | | | | | | | | | | | This commit fixes a broken build when compiling libavcodec with LLVM compiler. These assembly files use non-standard format that is only supported by GCC compiler. It would be nice to use a common standard format. With this patch, both GCC and LLVM can build and generate the same objects. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: Fix ff_interleaved_peek()Michael Niedermayer2016-06-25
| | | | | | | | | | | | Fixes assertion failures in movenc Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/matroskadec: Call matroska_read_close() on header parsing errorMichael Niedermayer2016-06-24
| | | | | | | | | | | | | | Fixes memleak Fixes Ticket5169 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: add anequalizer testPetru Rares Sincraian2016-06-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3'Clément Bœsch2016-06-24
|\| | | | | | | | | | | | | * commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3': xtea-test: Use struct allocation functions from the API Merged-by: Clément Bœsch <clement@stupeflix.com>
| * xtea-test: Use struct allocation functions from the APIDiego Biurrun2016-05-19
| |
* | Merge commit '8131bd4c22ad59b040173f67a5b2edb75863e801'Clément Bœsch2016-06-24
|\| | | | | | | | | | | | | * commit '8131bd4c22ad59b040173f67a5b2edb75863e801': blowfish-test: Use struct allocation functions from the API Merged-by: Clément Bœsch <clement@stupeflix.com>
| * blowfish-test: Use struct allocation functions from the APIDiego Biurrun2016-05-19
| |
* | Merge commit 'a86ef80494d759807a5ef8dd12838f0690092e37'Clément Bœsch2016-06-24
|\| | | | | | | | | | | | | * commit 'a86ef80494d759807a5ef8dd12838f0690092e37': blowfish-test: Return different values for different errors Merged-by: Clément Bœsch <clement@stupeflix.com>
| * blowfish-test: Return different values for different errorsDiego Biurrun2016-05-19
| |
* | Merge commit 'b84f3a40034d28828c4ca639d012479a7eaace28'Clément Bœsch2016-06-24
|\| | | | | | | | | | | | | * commit 'b84f3a40034d28828c4ca639d012479a7eaace28': movenc: Write 'loci' geotag metadata for 3gp and mp4 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * movenc: Write 'loci' geotag metadata for 3gp and mp4Martin Storsjö2016-05-19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f12a705ee570e16ca692c66b62821a2dbdf82566'Clément Bœsch2016-06-24
|\| | | | | | | | | | | | | * commit 'f12a705ee570e16ca692c66b62821a2dbdf82566': movenc: Factorize a function for finding a metadata entry and the associated language Merged-by: Clément Bœsch <clement@stupeflix.com>