aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* hevc: check slice address lengthAndreas Cadhalpun2015-07-102-2/+2
| | | | | | | It is used as get_bits argument and reading 0 bits isn't supported. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* Merge commit '872fab4a3df48e7e6484333ee2228c684e319634'Michael Niedermayer2015-07-101-1/+2
|\ | | | | | | | | | | | | * commit '872fab4a3df48e7e6484333ee2228c684e319634': asfdec: Fix reading from the pipe Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: Fix reading from the pipeAlexandra Hájková2015-07-101-1/+2
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/utils: Document 32 min for h264 widthMichael Niedermayer2015-07-101-0/+5
| | | | | | | | | | Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/g2meet: Check R/G/B values in epic_decode_pixel_pred()Michael Niedermayer2015-07-101-0/+5
| | | | | | | | | | | | | | Fixes: asan_double-free_d34593_861_smp3.wmv Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | snow: remove an obsolete av_assert2Andreas Cadhalpun2015-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It asserts that the frame linesize is larger than 37, but it can be smaller and decoding such frames works. Before commit cc884a35 src_stride > 7*MB_SIZE was necessary, because the blocks were interleaved in the tmp buffer and the last block was added with an offset of 6*MB_SIZE. It was changed for src_stride <= 7*MB_SIZE to write the blocks sequentially, hence the larger tmp_step. After that the assert was only necessary to make sure that the buffer remained large enough. Since commit bd2b6b33 s->scratchbuf is used as tmp buffer. As part of commit 86e107a7 the minimal scratchbuf size was increased to 256*7*MB_SIZE, which is enough for any src_stride <= 7*MB_SIZE. Also add a comment explaining the tmp_step calculation. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec/utils: use a minimum 32pixel width in avcodec_align_dimensions2() ↵Michael Niedermayer2015-07-101-1/+3
| | | | | | | | | | | | | | | | for H.264 Fixes Assertion failure Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/motion_est_template: Fix undefined behavior in small_diamond_search()Michael Niedermayer2015-07-101-2/+2
| | | | | | | | | | | | | | Fixes: asan_heap-oob_394322e_138_cov_4265020547_CVPCMNL1_SVA_C.264 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_removegrain: clip to uint16 instead to uint8Paul B Mahol2015-07-103-10/+10
| | | | | | | | | | | | This is how original filter behaves. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/libopenh264enc: Do not truncate frame rateMichael Niedermayer2015-07-101-1/+1
| | | | | | | | | | Suggested-by: Gregory J Wolfe <gregory.wolfe@kodakalaris.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '67c884eb07c7e9f2cb72bb8d447d945e5ac8cac7'Michael Niedermayer2015-07-101-0/+2
|\| | | | | | | | | | | | | * commit '67c884eb07c7e9f2cb72bb8d447d945e5ac8cac7': libvpx: Add the library header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvpx: Add the library headerVittorio Giovara2015-07-091-0/+2
| | | | | | | | Unbreak make checkheaders
* | Merge commit '461b45efd04859b2672238bc8a6ecab9e9a14948'Michael Niedermayer2015-07-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '461b45efd04859b2672238bc8a6ecab9e9a14948': lavc: Add nvenc.h to the skipheader Conflicts: libavcodec/Makefile No change as there is no nvenc.h in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add nvenc.h to the skipheaderLuca Barbato2015-07-091-0/+1
| | | | | | | | Unbreak make checkheaders
* | libavcodec/qsvenc.c: improving handling for return codes of ↵Ivan Uskov2015-07-101-5/+13
| | | | | | | | | | | | MFXVideoENCODE_EncodeFrameAsync Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Clear pointers in ff_mpv_common_init()Michael Niedermayer2015-07-091-4/+78
| | | | | | | | | | | | | | | | | | This ensures that no stale pointers leak through on any path Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add removegrain testsPaul B Mahol2015-07-0926-0/+128
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/rtpenc_jpeg: Error out for non-standard Huffman tables.Carl Eugen Hoyos2015-07-091-0/+20
| | | | | | | | Related to ticket #3823.
* | lavf/rtpenc_jpeg: Do not check the table number when checking precision.Carl Eugen Hoyos2015-07-091-1/+1
| |
* | ffmpeg: Use av_log to print benchmark output.Carl Eugen Hoyos2015-07-091-3/+3
| |
* | Cosmetics: Reindent after last commit.Carl Eugen Hoyos2015-07-091-5/+5
| |
* | lavf/matroskaenc: Do not needlessly allocate memory for cuepoints.Carl Eugen Hoyos2015-07-091-1/+3
| | | | | | | | Fixes ticket #4690.
* | libavcodec/qsvenc.c: Fix for too agressive height alignment during frame ↵Ivan Uskov2015-07-092-4/+7
| | | | | | | | | | | | encoding which may be reason of superflous frame copying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/qsvenc_hevc: Attempt to fix error: too few arguments to function ↵Michael Niedermayer2015-07-091-1/+1
| | | | | | | | | | | | | | ff_hevc_extract_rbsp Found-by: Ivan Uskov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]Jovan Zelincevic2015-07-095-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build system modified There are several warnings occurring during build after this patch is applied. The cause of most of these warnings is in that some definitions needed here are logical part of sbr module and are added in later patches. When this patches are applied these warnings stop occurring. The only warning that is added here and is not fixed with later patches is warning that warns that type mismatch for table ff_aac_eld_window_480. The reason for this warning is in that ER AAC ELD 480 is not integrated in to the fixed point implementation at this moment and there is no fixed point version of this table. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec: Implementation of AAC_fixed_decoder (LC-module) [3/4]Djordje Pesut2015-07-095-146/+809
| | | | | | | | | | | | | | Add fixed point implementation Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec: Implementation of AAC_fixed_decoder (LC-module) [2/4]Jovan Zelincevic2015-07-0916-35/+680
| | | | | | | | | | | | | | Add fixed point implementation of functions for generating tables Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]Jovan Zelincevic2015-07-096-3060/+3136
| | | | | | | | | | | | | | Move existing code to the new template files Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc_ps: Remove gotos from ff_hevc_parse_sps()Michael Niedermayer2015-07-091-50/+29
| | | | | | | | | | | | | | They are currently unnecessary Found-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784'Michael Niedermayer2015-07-090-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784': configure: Make the new qsv encoder depend on libmfx Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Make the new qsv encoder depend on libmfxLuca Barbato2015-07-091-0/+2
| | | | | | | | Found-by: kropping
* | Merge commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59'Michael Niedermayer2015-07-091-1/+6
|\| | | | | | | | | | | | | * commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59': x86: Serialize rdtsc in read_time() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Serialize rdtsc in read_time()Henrik Gramner2015-07-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the accuracy of measurements, especially in short sections. To quote the Intel 64 and IA-32 Architectures Software Developer's Manual: "The RDTSC instruction is not a serializing instruction. It does not necessarily wait until all previous instructions have been executed before reading the counter. Similarly, subsequent instructions may begin execution before the read operation is performed. If software requires RDTSC to be executed only after all previous instructions have completed locally, it can either use RDTSCP (if the processor supports that instruction) or execute the sequence LFENCE;RDTSC." SSE2 is a requirement for lfence so only use it on SSE2-capable systems. Prefer lfence;rdtsc over rdtscp since rdtscp is supported on fewer systems. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'Michael Niedermayer2015-07-091-1/+2
|\| | | | | | | | | | | | | | | * commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9': avconv: vda: Unlock the pixel buffer once it is accessed See: c06fdacc3dc706e70d953917fea845532d3703ca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: vda: Unlock the pixel buffer once it is accessedSebastien Zwickert2015-07-091-0/+2
| | | | | | | | | | | | | | | | | | Avoid possible issues with memmapped hardware buffers in case VDA is not doing a conversion on behalf of the user and make the code more proper as working example. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949'Michael Niedermayer2015-07-091-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '8fcd121b823caeadbe7597c9ae9229f6f164f949': doc: Use the succinct syntax for the channelmap example Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Use the succinct syntax for the channelmap exampleLuca Barbato2015-07-091-1/+1
| | | | | | | | Mixing succinct and long syntax does not work.
* | configure: Fix build without libmfxMichael Niedermayer2015-07-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'Michael Niedermayer2015-07-0913-18/+476
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '66acb76bb0492b263215ca9b4d927a7be39ace02': lavc: add Intel libmfx-based HEVC encoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/qsv.c libavcodec/qsvenc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add Intel libmfx-based HEVC encoderAnton Khirnov2015-07-0813-17/+475
| |
* | configure: Fix build without libmfxMichael Niedermayer2015-07-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'Michael Niedermayer2015-07-096-4/+127
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3a85397e8bb477eb34678d9edc52893f57003226': lavc: add Intel libmfx-based MPEG2 encoder Conflicts: Changelog configure libavcodec/allcodecs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add Intel libmfx-based MPEG2 encoderAnton Khirnov2015-07-086-4/+127
| |
* | Merge commit '69ab9f53f901eac6a649e22d28cf093357870627'Michael Niedermayer2015-07-094-123/+156
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '69ab9f53f901eac6a649e22d28cf093357870627': hevc: split bitstream unescaping to a separate file Conflicts: libavcodec/Makefile libavcodec/hevc.c See: afa93d198aaf2cc661c4df6d4095cd030265d30a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: split bitstream unescaping to a separate fileAnton Khirnov2015-07-084-103/+137
| | | | | | | | It will be useful in the QSV HEVC encoder.
* | avcodec/hevc_ps: Do not return success on failures in ff_hevc_parse_sps()Michael Niedermayer2015-07-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7'Michael Niedermayer2015-07-093-111/+129
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7': hevc_ps: split the code for parsing the SPS and exporting it into the context Conflicts: libavcodec/hevc.c libavcodec/hevc_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc_ps: split the code for parsing the SPS and exporting it into the contextAnton Khirnov2015-07-083-92/+112
| | | | | | | | | | This will be useful in the later commits, where we want to parse an SPS without having a whole decoding context.
* | avcodev/libdcadec: implement request_channel_layoutJames Almer2015-07-081-0/+33
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e'Michael Niedermayer2015-07-091-1/+1
|\| | | | | | | | | | | | | * commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e': lavf/hevc: pad the RBSP buffer as required by the bistream reader Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-14 00:12:47 +0000