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
2016-06-23Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'Clément Bœsch
* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c': Move VLC and RL_VLC_ELEM structure definitions to a separate header Merged-by: Clément Bœsch <u@pkh.me>
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-05-17Move VLC and RL_VLC_ELEM structure definitions to a separate headerAlexandra Hájková
Use the newly created vlc.h directly instead of including get_bits when needed. The VLC and RL_VLC_ELEM structures are independent from the bitreader. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-03-29fix some a/an typosLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com>
2016-03-06bitstream.c: improve init_vlc error messages.Reimar Döffinger
Makes it far easier to spot the issue if e.g. caused by a typo in the code table. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2015-10-18avcodec/bitstream: replace qsort with AV_QSORTGanesh Ajjanagadde
Commit 3a0a2f33a6c955823fa4fb12c0b49cd29a496659 claims large performance advantages for AV_QSORT over libc's qsort. The reason is that I suspect that libc's qsort (at least on non LTO builds, like the typical FFmpeg config) can't inline the comparison callback: https://stackoverflow.com/questions/5290695/is-there-any-way-a-c-c-compiler-can-inline-a-c-callback-function. AV_QSORT has two things going for it: 1. The guaranteed inlining of qsort itself. This yields a negligible boost that may be ignored. 2. The more serious possibility of potentially allowing the comparison function to be inlined - this is likely responsible for the large boosts reported. There is a comment explaining that this is a place that could use some performance improvement. Thus AV_QSORT is used to achieve that. Benchmarks deemed unnecessary due to existing claims about AV_QSORT. Tested with FATE. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-06-16doc: avoid incorrect phrase 'allows to'Andreas Cadhalpun
Also fix typo found by Lou Logan: Sacrifying -> Sacrificing Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-14doc: fix spelling errorsAndreas Cadhalpun
Neccessary -> Necessary formated -> formatted thee -> the eventhough -> even though seperately -> separately Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-25avcodec/bitstream: Assert that there is enough space left in avpriv_copy_bits()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara
2015-02-14Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'Michael Niedermayer
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0': avcodec: Don't anonymously typedef structs Conflicts: libavcodec/alac.c libavcodec/cinepak.c libavcodec/cscd.c libavcodec/dcadec.c libavcodec/g723_1.c libavcodec/gif.c libavcodec/iff.c libavcodec/kgv1dec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/ra288.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avcodec: Don't anonymously typedef structsDiego Biurrun
2014-07-02avcodec/bitstream: remove trivial assertMichael Niedermayer
Fixed CID1224273 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21avcodec/bitstream: document the double volatileMichael Niedermayer
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20avcodec/bitstream: try to workaround internal compiler bug in gcc 4.2Michael Niedermayer
gcc 4.2 seems not maintained anymore so theres no option besides just working around it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16avcodec/bitstream: try to make vlc init code inherently thread safeMichael Niedermayer
also remove spinlock, it doesnt work on AIX Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16avcodec/bitstream: fill invalid vlc tables entries as last pass instead of firstMichael Niedermayer
This avoids writing entries twice Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16avcodec/bitstream: zero vlc tables on allocationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08vcodec/bitstream: use av_malloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-23avcodec/bitstream: assert that no integer overflow happened when writing ↵Michael Niedermayer
codes in build_table() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11avcodec/bitstream: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'Michael Niedermayer
* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c': avcodec: Use av_reallocp where suitable Conflicts: libavcodec/bitstream.c libavcodec/eatgv.c libavcodec/flashsv.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09avcodec: Use av_reallocp where suitableAlexandra Khirnova
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-15bitstream: Check the result of av_malloc()Diego Biurrun
2013-08-08avcodec/bitstream: Dont try to free buffers for static VLCsMichael Niedermayer
Such buffers are not malloced thus freeing would be bad. Note though this condition never could have happened so this is more for correctness sake and not a true bugfix Fixes CID1061047 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29avcodec/ff_init_vlc_sparse: use a local array for static vlcs avoiding malloc()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29avcodec/ff_init_vlc_sparse: use a spinlock for thread syncMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29Revert "bitstream: make vlc init of static tables thread safe."Michael Niedermayer
This reverts commit 4b6869d6e0120c92253d525921f0e04361888e10. Conflicts: libavcodec/bitstream.c This code can cause assertion failures on artificial OOM situations It will be replaced by a solution that doesnt have this issue in the following commits. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09bitstream: fix a crash in case of oomPiotr Bandurski
fixes ticket #2766 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-17Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'Michael Niedermayer
* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3': bitstream: forward error values and drop few abort() Conflicts: libavcodec/bitstream.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-17Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'Michael Niedermayer
* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f': bitstream: K&R formatting cosmetics Conflicts: libavcodec/bitstream.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-16bitstream: forward error values and drop few abort()Luca Barbato
2013-06-16bitstream: K&R formatting cosmeticsLuca Barbato
2013-05-21avcodec/bitstream: print vlc length in error case.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21init_vlc_sparse: fix leak on errorMichael Niedermayer
Fixes CID1005312 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-18avcodec/bitstream: check codes in ff_init_vlc_sparse()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-18avcodec/bitstream: Check bits in ff_init_vlc_sparse()Michael Niedermayer
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21miscellaneous typo fixesDiego Biurrun
2012-12-07bitstream: make vlc init of static tables thread safe.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06Revert "Add assert that the avcodec lock is held when initializing static ↵Michael Niedermayer
VLC tables." This reverts commit dd154198b1afa9f3f740eb0b2ccd7ab665f8edd4.
2012-12-06Add assert that the avcodec lock is held when initializing static VLC tables.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-10-13Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'Michael Niedermayer
* commit 'd5c62122a7b26704bf867a1262df358623bf5edf': Move av_reverse table to libavcodec Conflicts: libavcodec/asvenc.c libavcodec/vble.c libavutil/common.h libavutil/mathematics.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12Move av_reverse table to libavcodecDiego Biurrun
It is only used in that library.
2012-09-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: dsputil: Only compile motion_est code when encoders are enabled mem: fix typo in check for __ICC fate: mp3: drop redundant CMP setting rtp: Depacketization of JPEG (RFC 2435) Rename ff_put_string to avpriv_put_string mjpeg: Rename some symbols to avpriv_* instead of ff_* yadif: cosmetics Conflicts: Changelog libavcodec/mjpegenc.c libavcodec/x86/Makefile libavfilter/vf_yadif.c libavformat/version.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-09Rename ff_put_string to avpriv_put_stringMartin Storsjö
This allows using it from libavformat as well. This will be used by the RTP/JPEG depacketizer. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-24libavcodec/bitstream: switch to av_assertMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-23bitstream: build_table, check table_nb_bits.Michael Niedermayer
Fixes null ptr deref. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>