summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avformat/mpjpeg: make boundary tag user customizableMichael Niedermayer2014-10-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/subtitles: reduce log level of UTF-16 warningwm42014-10-29
| | | | Applications can use this to silence the message.
* lavu/atomic: add support for the new memory model aware gcc built-insJames Almer2014-10-29
| | | | | | | | | | | | __sync built-ins are considered legacy and will be deprecated. These new memory model aware built-ins have been available since GCC 4.7.0 Use them by default when available except for __atomic_compare_exchange_n(), which is slower, and is instead implemented as a fallback for when and if gcc removes the legacy __sync built-ins. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* lavd/v4l2: don't use avpriv_ prefix for internal functionsJames Almer2014-10-29
| | | | | | | | | | No need to keep the old symbols around until a major bump since lavd functions with the avpriv_ prefix were never exposed. Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/utils: Align dimensions by at least their chroma sub-sampling factors.Michael Niedermayer2014-10-29
| | | | | | | Fixes: out of array accesses Fixes: asan_heap-oob_112c6b3_13_012.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/libutvideodec: Try to fix build failure with old libutvideoMichael Niedermayer2014-10-29
| | | | | Found-by: Jan Ehrhardt <phpdev@ehrhardt.nl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mxfenc: AVC Intra supportThomas Mundt2014-10-29
| | | | | | | | | To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra. This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header. Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Improve the fieldmatch documentation about mixed telecined content.Carl Eugen Hoyos2014-10-29
| | | | | | The fieldmatch filter has no problem with mixed telecined and progressive content but the decimate filter does not detect the changing framerate and drops progressive frames.
* avformat/mxfdec: fix null pointer dereferenceMichael Niedermayer2014-10-29
| | | | | | Fixes: signal_sigsegv_b5b3d4_2_001.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-10-29
|\ | | | | | | | | | | | | | | | | | | * cehoyos/master: Mention in the documentation that fieldmatch needs cfr input. Use v4l2 input format automatically if filename starts with "/dev/video" Print a warning if a subtitle demuxer changes utf16 to utf8. Do not set the lame quality if the user didn't request it. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mention in the documentation that fieldmatch needs cfr input.Carl Eugen Hoyos2014-10-29
| | | | | | | | | | | | | | | | This can be improved in the decimate filter but for the moment explicitely mentioning that mixed telecined and progressive content is unsupported is an improvement. Fixes ticket #3968.
| * Use v4l2 input format automatically if filename starts with "/dev/video"Andrey Utkin2014-10-29
| | | | | | | | Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
| * Print a warning if a subtitle demuxer changes utf16 to utf8.Carl Eugen Hoyos2014-10-29
| | | | | | | | | | | | | | This does not fix anything but gives users a chance to know that they must not pass -sub_charenc UTF-16 to ffmpeg. Fixes ticket #4059.
| * Do not set the lame quality if the user didn't request it.Carl Eugen Hoyos2014-10-29
| | | | | | | | This makes FFmpeg's mp3 output more similar to lame's output.
* | avcodec/dnxhddec: treat pix_fmt like width/heightMichael Niedermayer2014-10-29
|/ | | | | | | Fixes out of array accesses Fixes: asan_heap-oob_22c9a39_16_015.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Tighten RIP length bounds in mxf_read_random_index_pack()Tomas Härdin2014-10-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Merge last_partition and footer_partitionTomas Härdin2014-10-28
| | | | | | | | FooterPartition offset specified in RIP takes precedence over any value written in PartitionPacks. This fixes the same issue f06f6da tries to fix without introducing an extra variable. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Revert "avformat/mxfdec: detect loops during header parsing"Tomas Härdin2014-10-28
| | | | | | This reverts commit 1c010fd035c1a14dc73827b84f21f593e969a5d6. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Parse PreviousPartition in mxf_seek_to_previous_partition()Tomas Härdin2014-10-28
| | | | | | | | | | Without this patch the demuxer can get stuck in a loop if PreviousPartition points somewhere where there's no PartitionPack, or if klv_read_packet() syncs back up to the current partition. This should fix Ticket3278 properly and unbreak Ticket4040. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Break out parts of mxf_read_header() into separate functionsTomas Härdin2014-10-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mvdec: Check size in read_table() for validityMichael Niedermayer2014-10-28
| | | | | | | | | | | | This check is redundant with the previous commit but it provides better error messages and feedback while the previous commit ensures that var_read_string() doesnt return uninitialized arrays if it itself is feeded with an invalid size possibly through a different future codepath. Fixes: asan_heap-oob_49b1e5_12_011.movie Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mvdec: Check size for validity in var_read_string()Michael Niedermayer2014-10-28
| | | | | | | Fixes out of array read Fixes: asan_heap-oob_49b1e5_12_011.movie Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dxa: check dimensionsMichael Niedermayer2014-10-28
| | | | | | | Fixes out of array access Fixes: asan_heap-oob_11222fb_21_020.dxa Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dvenc: mark encoder as intraChristophe Gisquet2014-10-28
| | | | | | And thus allow various multithreading. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dv: increase VLC reading bits to 10Christophe Gisquet2014-10-28
| | | | | | | This also requires a bump in the table size of bit patterns to 1664. From 356 to 348 cycles. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avdevice/xcbgrab: set avclass categoryMichael Niedermayer2014-10-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'Michael Niedermayer2014-10-28
|\ | | | | | | | | | | | | | | | | * commit '4ad1eba011860224831ce0bb3123f6f55716b68a': lavd: fix building x11grab after a6674d2 no change as the buggy line was not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavd: fix building x11grab after a6674d2Anton Khirnov2014-10-28
| |
* | Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'Michael Niedermayer2014-10-28
|\| | | | | | | | | | | | | * commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745': vdpau: return MAIN instead of BASELINE for H.264 CBP Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: return MAIN instead of BASELINE for H.264 CBPRémi Denis-Courmont2014-10-28
| | | | | | | | | | | | | | This is the same as the previous change, but for applications using the old API (such as VLC 2.2). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'Michael Niedermayer2014-10-28
|\| | | | | | | | | | | | | * commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893': vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBPRémi Denis-Courmont2014-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The H.264 Constrained Baseline Profile (CBP) is a subset of both the Main Profile and the Baseline Profile. In principles, a hardware decoder that supports either of those can decode CBP content. As it happens, Main is supported by all VDPAU drivers, and Baseline is not. So favor map CBP to MP for now. Hopefully in the future libvdpau will offer an explicit choice for CBP. This fixes bug 757. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/dirac_arith: fix integer overflowMichael Niedermayer2014-10-28
| | | | | | | | | | | | Fixes: asan_heap-oob_1078676_9_008.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/diracdec: Tighter checks on CODEBLOCKS_X/YMichael Niedermayer2014-10-28
| | | | | | | | | | | | | | Fixes very long but finite loop Fixes: asan_heap-oob_107866c_42_041.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/diracdec: Use 64bit in calculation of codeblock coordinatesMichael Niedermayer2014-10-28
| | | | | | | | | | | | | | | | Fixes integer overflow Fixes out of array read Fixes: asan_heap-oob_107866c_42_041.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '11467ecf519788f2e2f49c63a17eb600e618489e'Michael Niedermayer2014-10-27
|\| | | | | | | | | | | | | | | * commit '11467ecf519788f2e2f49c63a17eb600e618489e': mxfdec: reduce loop bound in mxf_read_pixel_layout() See: 187630b2449f1eae1096f81f31bab7d81bed3cf1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: reduce loop bound in mxf_read_pixel_layout()Tomas Härdin2014-10-27
| | | | | | | | | | | | Makes coverity less confused and code more readable. Bug-Id: CID 732262
* | avformat/bethsoftvid: print error in case the side date failed to be allocatedMichael Niedermayer2014-10-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'Michael Niedermayer2014-10-27
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600': bethsoftvid: check return value and clean memory Conflicts: libavformat/bethsoftvid.c See: 3632f35c8e163f6aa6d63c317e3e1fca6a4a5fab Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bethsoftvid: check return value and clean memoryVittorio Giovara2014-10-27
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733777
* | avformat/filmstripdec: Fix several integer overflowsMichael Niedermayer2014-10-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'Michael Niedermayer2014-10-27
|\| | | | | | | | | | | | | * commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f': filmstripdec: avoid integer overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * filmstripdec: avoid integer overflowVittorio Giovara2014-10-27
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732246
* | Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'Michael Niedermayer2014-10-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '090c67d586e3916f9acc49e010b6389d07f97153': matroskaenc: write correct Display{Width, Height} in stereo encoding Conflicts: libavformat/matroskaenc.c See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write correct Display{Width, Height} in stereo encodingVittorio Giovara2014-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | should be the raw amount of pixels (for example 3840x1080 for full HD side by side) and the DisplayWidth/Height in pixels should be the amount of pixels for one plane (1920x1080 for that full HD stream)." So, move the aspect ratio check in the mkv_write_stereo_mode() function and always write the embl when stereo format and/or aspect ration is set. Also add a few comments to that function. CC: libav-stable@libav.org Found-by: Asan Usipov <asan.usipov@gmail.com>
* | Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'Michael Niedermayer2014-10-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96': xcbgrab: XCB-based screen capture Conflicts: Changelog configure libavdevice/Makefile libavdevice/alldevices.c libavdevice/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: XCB-based screen captureLuca Barbato2014-10-26
| | | | | | | | Matches the x11grab screen capture by features.
* | avcodec/sgidec: fix count checkMichael Niedermayer2014-10-27
| | | | | | | | | | | | Fixes: asan_heap-oob_22b30d4_39_038.sgi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/sgidec: fix linesize for 16bitMichael Niedermayer2014-10-27
| | | | | | | | | | | | Fixes: asan_heap-oob_22b30d4_39_038.sgi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Fix compilation for non MAC OS devices by conditional ↵Thilo Borgmann2014-10-27
| | | | | | | | | | | | compilation of screen capture capabilities. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 22:48:35 +0000