Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-26avcodec/omx: Do not pass negative value into av_malloc()Michael Niedermayer
Fixes CID1396849 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bd83c295fc1b7f8001e5d134b912af86cd62c3f2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-01Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'James Almer
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c': h264: add H264_ prefix to the NAL unit types Conflicts: libavcodec/h264_parse.c libavcodec/h264_parser.c libavcodec/h264_slice.c libavcodec/h264dec.c Merged-by: James Almer <jamrial@gmail.com>
2016-07-29Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'Clément Bœsch
* commit '251cbb44003caf179fb17afbb8a6c56643c2a646': h264: create a new header for common h264 definitions Merged-by: Clément Bœsch <u@pkh.me>
2016-07-29Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'Clément Bœsch
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa': h264: rename h264.[ch] to h264dec.[ch] Merged-by: Clément Bœsch <u@pkh.me>
2016-06-25omx: Don't return > 0 from omx_encode_frameMartin Storsjö
The encode function is supposed to just return 0 on success. This stems from a mixup with the return value of decode functions. Reviewed-by: Jan Gerber <j@v2v.cc> Signed-off-by: Martin Storsjö <martin@martin.st>
2016-06-25avcodec/omx: fix deprecation warning for ff_alloc_packetAman Gupta
Tested-by: Jan Gerber <j@v2v.cc> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21h264: add H264_ prefix to the NAL unit typesAnton Khirnov
This will prevent conflicts e.g. in code that deals with both h264 and hevc.
2016-06-21h264: create a new header for common h264 definitionsAnton Khirnov
Move the NAL unit types into it. This will allow to stop including the whole decoder-specific h264dec.h in some code that is unrelated to the decoder and only needs some enum values.
2016-06-21h264: rename h264.[ch] to h264dec.[ch]Anton Khirnov
This is more consistent with the naming of other decoders.
2016-05-11Merge commit '1bb56abb9b37bd208a66164339c92cad59b1087b'Derek Buitenhuis
* commit '1bb56abb9b37bd208a66164339c92cad59b1087b': omx: Add support for zerocopy input of frames Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-11Merge commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658'Derek Buitenhuis
* commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658': omx: Add support for broadcom OMX on raspberry pi Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-11Merge commit 'e8919ec486a5559fdcf366e347be0656d904a87f'Derek Buitenhuis
* commit 'e8919ec486a5559fdcf366e347be0656d904a87f': libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-12omx: Add support for zerocopy input of framesMartin Storsjö
This can only be used if the input data happens to be laid out exactly correctly. This might not be supported on all encoders, so only enable it with an option, but enable it automatically on raspberry pi, where it is known to be supported. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-04-12omx: Add support for broadcom OMX on raspberry piMartin Storsjö
The raspberry pi uses the alternative API/ABI for OMX; this makes such builds incompatible with all the normal OpenMAX implementations. Since this can't easily be detected at configure time (one can build for raspberry pi's OMX just fine using the generic, pristine Khronos OpenMAX IL headers, no need for their own extensions), require a separate configure switch for it instead. The broadcom host library can't be unloaded once loaded and started; the deinit function that it provides is a no-op, and after started, it has got background threads running, so dlclosing it makes it crash. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-04-12libavcodec: Add H264/MPEG4 encoders based on OpenMAX ILMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>