summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | avformat/hevc: Check cpb_cnt_minus1Michael Niedermayer2015-05-12
| | | | | | | | | | | | Fixes CID1239014 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: Handle read_buffer allocation failureMichael Niedermayer2015-05-12
| | | | | | | | | | | | Fixes CID1297576 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/idcin: Remove redundant chunk size checkMichael Niedermayer2015-05-12
| | | | | | | | | | | | Fixes CID1138438 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: Cleanup error handling for bz2 & zlibMichael Niedermayer2015-05-12
| | | | | | | | | | | | Fixes CID703652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutdec: Fix use of uinitialized valueMichael Niedermayer2015-05-12
| | | | | | | | | | | | Fixes CID1041175 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtpdec_xiph: Move pkt_len onto one side of the checkMichael Niedermayer2015-05-12
| | | | | | | | | | | | | | This is more correct Fixes CID1271793 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtpdec_xiph: Check upper bound on len in xiph_handle_packet()Michael Niedermayer2015-05-12
| | | | | | | | | | | | Larger packets are not supported and would cause problems later Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtpenc_jpeg: Check remaining buffer size for SOSMichael Niedermayer2015-05-12
| | | | | | | | | | | | Fixes CID1238818 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/riffenc: Use size_t for strlen in ff_riff_write_info_tag()Michael Niedermayer2015-05-12
| | | | | | | | | | | | Also dont generated corrupted output for larger than 4gb strings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_aphaser: reject too small delayPaul B Mahol2015-05-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/img2dec: add option to disable pattern matchingMarton Balint2015-05-12
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: Test pullup and fieldmatch with 5 instead of 1 frameMichael Niedermayer2015-05-12
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'Michael Niedermayer2015-05-12
|\| | | | | | | | | | | | | | | * commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce': riff: Add MultiScope II fourcc MSC2 as MJPEG See: e31cdb5cc8080e164c66838a69f37f60f2d0ea82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add MultiScope II fourcc MSC2 as MJPEGCarl Eugen Hoyos2015-05-12
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9'Michael Niedermayer2015-05-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9': dca_parser: Extend DTS core sync word and fix existing check Conflicts: libavcodec/dca_parser.c See: e80b2b9c81716a5d9f559c04cfe69d76b04e4cd3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca_parser: Extend DTS core sync word and fix existing checkfoo862015-05-12
| | | | | | | | | | | | | | | | | | | | | | | | The previous version checked for 14-bit streams and did not properly work across buffer boundaries. Use the 64-bit parser state to make extended sync word detection work across buffer boundary and check the extended sync word for 16-bit LE and BE core streams to reduce probability of alias sync detection. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | tools/graph2dot: use larger data types than int for array/string sizesMichael Niedermayer2015-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/internal: Fix warning about struct declarationMichael Niedermayer2015-05-12
| | | | | | | | | | | | Moving ffio_open2_wrapper() to internal as it uses AVFormatContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: Fix order of operations in hls_decode_neighbour()Michael Niedermayer2015-05-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mlvdec: Use AVFormatContext->open_cb()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avformat: slightly more verbose documentation for open_cb()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Use open_cb() if setMichael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add callback for opening further filesMichael Niedermayer2015-05-11
| | | | | | | | | | Previous version reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | id3v2: catch avio_read errors in check_tagAndreas Cadhalpun2015-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since len is an unsigned int, the comparison is currently treated as unsigned and thus ignores all errors from avio_read. Thus cast len to int, which is unproblematic, because at that point len is between 0 and 4. This fixes 'Conditional jump or move depends on uninitialised value' valgrind warnings in is_tag. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/avstring: Use size_t in av_strlcatf()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Pass MovContext into mov_open_dref()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libx265: use x265 Multi-library Interface to query the APIGopu Govindaswamy2015-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffmpeg can now use the x265 multi-library interface to make a runtime selection between a number of libx265 libraries (perhaps 8bpp and 16bpp). ffmpeg will link to one build of libx265 (statically or dynamically) and this linked version of libx265 will support one bit-depth (8 or 10 bits). At runtime, ffmpeg now has the option to request the encoder to use a different bit depth(8 or 10). If the requested bitdepth is zero, or if it matches the bitdepth of the system default libx265 (the currently linked library), then this library will be used for encode. If ffmpeg requests a different bit-depth, the linked libx265 will attempt to dynamically bind a shared library with the requested bit-depth from the install location (default or user-specified). new x265 API: const x265_api* api = x265_api_get(int bitDepth); x265_api - holds the libx265 public API functions bitDepth - requested API for 8bpp or 16bpp note: Use 0 to indicate native bit depth of the linked libx265 and x265_api_get(0) is guaranteed to return a non-null pointer Signed-off-by: Gopu Govindaswamy <gopu@multicorewareinc.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/vorbiscomment: Use 64bit int for ff_vorbiscomment_length()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: Check ff_vorbiscomment_length in put_flac_codecpriv()Michael Niedermayer2015-05-11
| | | | | | | | | | | | Its currently guaranteed to be smaller but its safer to check anyway Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flacenc: Check length in flac_write_block_comment()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/subtitles: Use size_t for lenMichael Niedermayer2015-05-11
| | | | | | | | | | | | | | string length could theoretically be larger than int Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: Use size_t for the variable holding a strlen() value.Michael Niedermayer2015-05-11
| | | | | | | | | | | | Should make no difference but is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/url: Use size_t for len from strlen()Michael Niedermayer2015-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd'Michael Niedermayer2015-05-11
|\| | | | | | | | | | | | | * commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd': dashenc: Reduce the segment duration if cutting out parts with edit lists Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Reduce the segment duration if cutting out parts with edit listsMartin Storsjö2015-05-10
| | | | | | | | | | | | | | | | This makes sure that the time + duration of the first segment matches the start time of the next segment for e.g. AAC audio with encoder delay. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'Michael Niedermayer2015-05-11
|\| | | | | | | | | | | | | | | * commit 'ac1a1cb948fe29975424e367173b88db48792144': dashenc: replace attribute id with contentType for the AdaptationSet element See: 32a4177a627ddce984a5a9ed7023d9a63dcbdf85 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: replace attribute id with contentType for the AdaptationSet elementJames Almer2015-05-10
| | | | | | | | | | | | | | | | | | | | id should be an integer, not a string. It is also optional, so use contentType instead which is the proper attribute for these values. This fixes an MPD validation error. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | dashenc: replace attribute id with contentType for the AdaptationSet elementJames Almer2015-05-11
| | | | | | | | | | | | | | | | | | | | id should be an integer, not a string. It is also optional, so use contentType instead which is the proper attribute for these values. This addresses ticket #4545, fixing an MPD validation error. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: Use more than 5 frames for testing select and idet filtersMichael Niedermayer2015-05-10
| | | | | | | | | | | | | | Testing these filters with just 5 frames could potentially be insufficient Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2fb02ecfd115a627f22df21720aa0bd4f6fcee8b'Michael Niedermayer2015-05-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fb02ecfd115a627f22df21720aa0bd4f6fcee8b': fate: Reduce the number of frames used to test video filters Conflicts: tests/fate-run.sh tests/ref/fate/filter-crop tests/ref/fate/filter-crop_scale tests/ref/fate/filter-crop_scale_vflip tests/ref/fate/filter-crop_vflip tests/ref/fate/filter-null tests/ref/fate/filter-pixdesc-abgr tests/ref/fate/filter-pixdesc-argb tests/ref/fate/filter-pixdesc-bgr24 tests/ref/fate/filter-pixdesc-bgr444be tests/ref/fate/filter-pixdesc-bgr444le tests/ref/fate/filter-pixdesc-bgr48be tests/ref/fate/filter-pixdesc-bgr48le tests/ref/fate/filter-pixdesc-bgr4_byte tests/ref/fate/filter-pixdesc-bgr555be tests/ref/fate/filter-pixdesc-bgr555le tests/ref/fate/filter-pixdesc-bgr565be tests/ref/fate/filter-pixdesc-bgr565le tests/ref/fate/filter-pixdesc-bgr8 tests/ref/fate/filter-pixdesc-bgra tests/ref/fate/filter-pixdesc-gbrap tests/ref/fate/filter-pixdesc-gbrp tests/ref/fate/filter-pixdesc-gbrp10be tests/ref/fate/filter-pixdesc-gbrp10le tests/ref/fate/filter-pixdesc-gbrp9be tests/ref/fate/filter-pixdesc-gbrp9le tests/ref/fate/filter-pixdesc-gray tests/ref/fate/filter-pixdesc-gray16be tests/ref/fate/filter-pixdesc-gray16le tests/ref/fate/filter-pixdesc-monob tests/ref/fate/filter-pixdesc-monow tests/ref/fate/filter-pixdesc-nv12 tests/ref/fate/filter-pixdesc-nv21 tests/ref/fate/filter-pixdesc-rgb24 tests/ref/fate/filter-pixdesc-rgb444be tests/ref/fate/filter-pixdesc-rgb444le tests/ref/fate/filter-pixdesc-rgb48be tests/ref/fate/filter-pixdesc-rgb48le tests/ref/fate/filter-pixdesc-rgb4_byte tests/ref/fate/filter-pixdesc-rgb555be tests/ref/fate/filter-pixdesc-rgb555le tests/ref/fate/filter-pixdesc-rgb565be tests/ref/fate/filter-pixdesc-rgb565le tests/ref/fate/filter-pixdesc-rgb8 tests/ref/fate/filter-pixdesc-rgba tests/ref/fate/filter-pixdesc-uyvy422 tests/ref/fate/filter-pixdesc-yuv410p tests/ref/fate/filter-pixdesc-yuv411p tests/ref/fate/filter-pixdesc-yuv420p tests/ref/fate/filter-pixdesc-yuv420p10be tests/ref/fate/filter-pixdesc-yuv420p10le tests/ref/fate/filter-pixdesc-yuv420p16be tests/ref/fate/filter-pixdesc-yuv420p16le tests/ref/fate/filter-pixdesc-yuv420p9be tests/ref/fate/filter-pixdesc-yuv420p9le tests/ref/fate/filter-pixdesc-yuv422p tests/ref/fate/filter-pixdesc-yuv422p10be tests/ref/fate/filter-pixdesc-yuv422p10le tests/ref/fate/filter-pixdesc-yuv422p16be tests/ref/fate/filter-pixdesc-yuv422p16le tests/ref/fate/filter-pixdesc-yuv422p9be tests/ref/fate/filter-pixdesc-yuv422p9le tests/ref/fate/filter-pixdesc-yuv440p tests/ref/fate/filter-pixdesc-yuv444p tests/ref/fate/filter-pixdesc-yuv444p10be tests/ref/fate/filter-pixdesc-yuv444p10le tests/ref/fate/filter-pixdesc-yuv444p16be tests/ref/fate/filter-pixdesc-yuv444p16le tests/ref/fate/filter-pixdesc-yuv444p9be tests/ref/fate/filter-pixdesc-yuv444p9le tests/ref/fate/filter-pixdesc-yuva420p tests/ref/fate/filter-pixdesc-yuva420p10be tests/ref/fate/filter-pixdesc-yuva420p10le tests/ref/fate/filter-pixdesc-yuva420p16be tests/ref/fate/filter-pixdesc-yuva420p16le tests/ref/fate/filter-pixdesc-yuva420p9be tests/ref/fate/filter-pixdesc-yuva420p9le tests/ref/fate/filter-pixdesc-yuva422p tests/ref/fate/filter-pixdesc-yuva422p10be tests/ref/fate/filter-pixdesc-yuva422p10le tests/ref/fate/filter-pixdesc-yuva422p16be tests/ref/fate/filter-pixdesc-yuva422p16le tests/ref/fate/filter-pixdesc-yuva422p9be tests/ref/fate/filter-pixdesc-yuva422p9le tests/ref/fate/filter-pixdesc-yuva444p tests/ref/fate/filter-pixdesc-yuva444p10be tests/ref/fate/filter-pixdesc-yuva444p10le tests/ref/fate/filter-pixdesc-yuva444p16be tests/ref/fate/filter-pixdesc-yuva444p16le tests/ref/fate/filter-pixdesc-yuva444p9be tests/ref/fate/filter-pixdesc-yuva444p9le tests/ref/fate/filter-pixdesc-yuvj420p tests/ref/fate/filter-pixdesc-yuvj422p tests/ref/fate/filter-pixdesc-yuvj440p tests/ref/fate/filter-pixdesc-yuvj444p tests/ref/fate/filter-pixdesc-yuyv422 tests/ref/fate/filter-pixdesc-yvyu422 tests/ref/fate/filter-pixfmts-copy tests/ref/fate/filter-pixfmts-crop tests/ref/fate/filter-pixfmts-hflip tests/ref/fate/filter-pixfmts-null tests/ref/fate/filter-pixfmts-pad tests/ref/fate/filter-pixfmts-scale tests/ref/fate/filter-pixfmts-vflip tests/ref/fate/filter-scale200 tests/ref/fate/filter-scale500 tests/ref/fate/filter-vflip tests/ref/fate/filter-vflip_crop tests/ref/fate/filter-vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Reduce the number of frames used to test video filtersLuca Barbato2015-05-10
| | | | | | | | | | | | | | Use 5 frames for video filter tests and a single one for the pixelformat tests. Greatly reduces the test duration without reducing coverage.
* | Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'Michael Niedermayer2015-05-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '379e5603f4131e677ecf5ba79973dcd5603f28ea': id3v2: Do not export empty APIC description Conflicts: libavformat/id3v2.c See: b697b297b77f73c932307120e32c187d521d2ff7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: Do not export empty APIC descriptionwm42015-05-09
| | | | | | | | | | | | APIC tags always have a description. Tag writers obviously leave it empty if there is no description. In this case, libavformat would export "" as title. Do not set the title instead.
* | Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'Michael Niedermayer2015-05-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b9f7a677083647d85e583d6d7384938766a293d7': png: Set the color range as full range Conflicts: libavcodec/pngdec.c See: 72e7553125e61847d9cab77fb7de62440dca746b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * png: Set the color range as full rangewm42015-05-09
| | | | | | | | | | | | The format uses full range for the gray formats. CC: libav-stable@libav.org
* | Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'Michael Niedermayer2015-05-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '254f3daba4271c1918d9a7ad155b1442ef93ed29': nut: Make sure to clean up on read_header failure Conflicts: libavformat/nutdec.c See: 361702660d2c37a63b7d6381d39e1e1de8405260 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Make sure to clean up on read_header failureLuca Barbato2015-05-09
| | | | | | | | | | | | Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work. CC: libav-stable@libav.org
* | Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'Michael Niedermayer2015-05-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81': avi: Validate sample_size Conflicts: libavformat/avidec.c See: ca234639ac49a0dc073ac1f10977979acdb94f97 See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 14:40:17 +0000