summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | * commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675': libopenh264enc: Return a more sensible error code in some init failure paths Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264enc: Return a more sensible error code in some init failure pathsMartin Storsjö2016-07-15
| | | | | | | | | | | | Previously they returned the default AVERROR_UNKNOWN. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36b380dcd52ef47d7ba0559ed51192c88d82a9bd'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | * commit '36b380dcd52ef47d7ba0559ed51192c88d82a9bd': libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being setMartin Storsjö2016-07-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd0b1e6049b06eeeeca146ece4d2f199c5dba1565'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | * commit 'd0b1e6049b06eeeeca146ece4d2f199c5dba1565': libopenh264dec: Fix cleanup if the init failed early Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264dec: Fix cleanup if the init failed earlyMartin Storsjö2016-07-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '61cb9fac47498a38dfe7623f66aa1f3696e9158c'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | * commit '61cb9fac47498a38dfe7623f66aa1f3696e9158c': mov: fix stream extradata_size allocation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mov: fix stream extradata_size allocationMatthieu Bouron2016-07-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | * commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207': lavd: Drop unneeded av_init_packet()s Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavd: Drop unneeded av_init_packet()sVittorio Giovara2016-07-13
| | | | | | | | The input packet is already unref'd by the calling function.
* | Merge commit '390b95b88b2b896b63f257f69e434dfc0111e076'Hendrik Leppkes2016-11-18
|\| | | | | | | | | | | | | * commit '390b95b88b2b896b63f257f69e434dfc0111e076': fate: Add a mixed NAL coding sample Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * fate: Add a mixed NAL coding sampleVittorio Giovara2016-07-13
| | | | | | | | | | | | See 17c99b6158f2c6720af74e81ee727ee50d2e7e96. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | doc/bsfs: various improvementsMoritz Barsnick2016-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | - Restored alphabetical order. - Enhanced sections aac_adtstoasc, dca_core, h264_mp4toannexb. - Added sections hevc_mp4toannexb and vp9_superframe. - Renamed (if required) and filled previously empty sections mjpegadump, mov2textsub/text2movsub, mp3decomp, and remove_extra. - Fixes ticket #3198. Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Lou Logan <lou@lrcd.com>
* | ffprobe: fix crash in case -of is specified with an empty stringStefano Sabatini2016-11-17
| | | | | | | | Fix trac issue #5957.
* | avformat/movenc: Check frame rate before use.Michael Niedermayer2016-11-17
| | | | | | | | | | | | | | | | | | Fixes division by 0 This is similar to how avg_frame_rate is checked elsewhere Fixes: 6d24add0455f41b1b45b7ba615cd46f3/asan_generic_dc34c3_5480_0a2ef411cae999b9871ed71a2e481b71.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/ass_split: Change order of operations in ass_split_section()Michael Niedermayer2016-11-17
| | | | | | | | | | | | | | | | | | This matches the other branch Fixes out of array read Fixes: 4d142ca76d39fe685effcf5017098723/asan_heap-oob_31ae824_8611_348fdb64f9009b63c8a8eae9a0e497c5.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'cbbb404055877e3beb9890ffe22784a6a100963e'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit 'cbbb404055877e3beb9890ffe22784a6a100963e': fate: Restore order of h264 entries Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * fate: Restore order of h264 entriesVittorio Giovara2016-07-13
| |
* | Merge commit '61bd0ed781b56eea1e8e851aab34a2ee3b59fbac'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '61bd0ed781b56eea1e8e851aab34a2ee3b59fbac': h264: Log more information about invalid NALu size Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: Log more information about invalid NALu sizeVittorio Giovara2016-07-13
| |
* | Merge commit '7b1ae0e73ab7f7c5eabc70dbe2e579127c6e154f'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '7b1ae0e73ab7f7c5eabc70dbe2e579127c6e154f': checkasm/arm: preserve the stack alignment checkasm_checked_call Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * checkasm/arm: preserve the stack alignment checkasm_checked_callJanne Grunau2016-07-13
| | | | | | | | | | | | | | | | | | The stack used by checkasm_checked_call_vfp was a multiple of 4 when the checked function is called. AAPCS requires a double word (8 byte) aligned stack public interfaces. Since both calls are public interfaces the stack is misaligned when the checked is called. Might fix the SIGBUS error in the armv7-linux-clang-3.7 fate config.
* | Merge commit '80fbb7becae530167373fe5178966b7d7604306e'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '80fbb7becae530167373fe5178966b7d7604306e': checkasm: vp8.mc: initialize the full src buffer after ec32574209f Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * checkasm: vp8.mc: initialize the full src buffer after ec32574209fJanne Grunau2016-07-13
| | | | | | | | Fixes "Use of uninitialised value" valgrind warnings in checkasm.
* | Merge commit '17c99b6158f2c6720af74e81ee727ee50d2e7e96'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | | | | | * commit '17c99b6158f2c6720af74e81ee727ee50d2e7e96': h2645_parse: handle embedded Annex B NAL units in size prefixed NAL units This commit is a noop, see a9bb4cf87d1eb68f9ed2dc971e3400b95c1a6a78 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h2645_parse: handle embedded Annex B NAL units in size prefixed NAL unitsJanne Grunau2016-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression in ca2f19b9cc3 with some mov/mp4 files. The files have several NAL units in the supposed single NAL unit after the size field. Annex B start code prefixes are used to separate them. The first NAL unit is correctly parsed but the buffer does not point to the next size field. Instead semi random data (it seems to be the rbsp_stop_one_bit and the start code prefix) is then parsed as length and will exceed the remaining length of the buffer. Patch based on the code in h264's decode_nal_units() and a similar patch by Hendrik Leppkes in FFmpeg (a9bb4cf87d1). Bug-Id: ffmpeg/trac5529 Reported-By: Vittorio Giovara
* | Merge commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c': h264_ps: export actual height in MBs as SPS.mb_height Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264_ps: export actual height in MBs as SPS.mb_heightAnton Khirnov2016-07-11
| | | | | | | | | | | | | | | | | | | | | | | | Currently, SPS.mb_height is actually what the spec calls PicHeightInMapUnits, which is half the frame height when interlacing is allowed. Calling this 'mb_height' is quite confusing, and there are at least two associated bugs where this field is treated as the actual frame height - in the h264 parser and in the code computing maximum reordering buffer size for a given level. Fix those issues (and avoid possible future ones) by exporting the real frame height in this field.
* | Merge commit '99cf943339a2e5171863c48cd1a73dd43dc243e1'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '99cf943339a2e5171863c48cd1a73dd43dc243e1': d3d11va: don't keep the context lock while waiting for a frame Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * d3d11va: don't keep the context lock while waiting for a frameSteve Lhomme2016-07-11
| | | | | | | | | | | | also fixes a deadlock found by Денис Кулаков <kudesnik33ra@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2866d108c9e9da7baf53ff57a51d470691049a57'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '2866d108c9e9da7baf53ff57a51d470691049a57': vp8dsp: Remove the comment saying that the height is equal to the width Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vp8dsp: Remove the comment saying that the height is equal to the widthMartin Storsjö2016-07-10
| | | | | | | | | | | | | | | | This comment isn't true, the height can be different from the width for these functions (which is why the height is passed as a parameter to them). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8c816c0c9b12fdefd9046415e97df299880bc9b8'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '8c816c0c9b12fdefd9046415e97df299880bc9b8': checkasm/arm: align the clobber check data properly for ldrd Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * checkasm/arm: align the clobber check data properly for ldrdJanne Grunau2016-07-10
| | | | | | | | Should fix the SIGBUS in the armv7-linux-clang-3.7 fate target.
* | Merge commit 'ec32574209f36467ef0d22c21a7e811ba98c15b6'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit 'ec32574209f36467ef0d22c21a7e811ba98c15b6': checkasm: vp8: mc: test unequal width/height for partitions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * checkasm: vp8: mc: test unequal width/height for partitionsJanne Grunau2016-07-10
| |
* | Merge commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f': vp8/armv6: mc: avoid boolean expression in calculation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vp8/armv6: mc: avoid boolean expression in calculationJanne Grunau2016-07-10
| | | | | | | | | | | | | | | | | | | | | | | | GNU as evaluates true as '-1' while Apple's variant and llvm's internal assembler evaluate it as '1'. The best way to avoid this madness is to eliminate boolean expressions instead of trying to fix it with preprocessor directives. Use a direct formula to calculate the required temporary space on the stack in ff_put_vp8_{epel,bilin}{4,8,16}_h[246]v[246]_armv6(). Fixes a checkasm segfault in vp8dsp.mc when using llvm's internal assembler for a non-Apple target.
* | Merge commit 'fc5cdc0d5372f5103c71d5dede296734fe71ead2'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | | | | | * commit 'fc5cdc0d5372f5103c71d5dede296734fe71ead2': doc: escape left brace in texi2pod.pl regex This commit is a noop, see e43ea1cbb213def50083812936c6a3c8e28a7789 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * doc: escape left brace in texi2pod.pl regexJanne Grunau2016-07-10
| | | | | | | | | | Unescaped literal left braces are deprecated and a warning was added in Perl 5.22.
* | Merge commit 'd825b1a5306576dcd0553b7d0d24a3a46ad92864'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | | | | | * commit 'd825b1a5306576dcd0553b7d0d24a3a46ad92864': libopenh264: Support building with the 1.6 release This commit is a noop, see 293676c476733e81d7b596736add6cd510eb6960 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264: Support building with the 1.6 releaseMartin Storsjö2016-07-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4f7723cb3b913c577842a5bb088c804ddacac8df'Hendrik Leppkes2016-11-17
|\| | | | | | | | | | | | | * commit '4f7723cb3b913c577842a5bb088c804ddacac8df': movenc: Add an option for skipping writing the mfra/tfra/mfro trailer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Add an option for skipping writing the mfra/tfra/mfro trailerMartin Storsjö2016-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing a fragmented file, we by default write an index pointing to all the fragments at the end of the file. This causes constantly increasing memory usage during the muxing. For live streams, the index might not be useful at all. A similar fragment index is written (but at the start of the file) if the global_sidx flag is set. If ism_lookahead is set, we need to keep data about the last ism_lookahead+1 fragments. If no fragment index is to be written, we don't need to store information about all fragments, avoiding increasing the memory consumption linearly with the muxing runtime. This fixes out of memory situations with long live mp4 streams. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavc/ffv1dec: Scale output for msb-packed compression to full 16bit.Carl Eugen Hoyos2016-11-17
| | | | | | | | 2% slowdown for existing decode-line timer.
* | lavc/ffv1enc: Support pix_fmt GRAY10.Carl Eugen Hoyos2016-11-17
| |
* | avcodec/mpeg4videodec: Workaround interlaced mpeg4 edge MC bugMichael Niedermayer2016-11-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo: Fix edge emu buffer overlap with interlaced mpeg4Michael Niedermayer2016-11-17
| | | | | | | | | | | | | | Fixes Ticket5936 Regression since c5fc8ae12622a507d7b9ee30ddcd3734e6de6b1d Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/exr : fix channel size calculation for uint32 channelMartin Vignali2016-11-16
| | | | | | | | | | | | | | | | | | | | | | | | uint32 need 4 bytes not 1. Fix decoding when there is half/float and uint32 channel. This fixes crashes due to pointer corruption caused by invalid writes. The problem was introduced in commit 03152e74dfdc7f438cb4a10402c4de744e807e22. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | exr: reindent after previous commitAndreas Cadhalpun2016-11-16
| | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 17:30:14 +0000