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-12-06avcodec/get_bits: Fix get_sbits_long(0)Michael Niedermayer
Fixes undefined behavior Fixes: 640889-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c72fa432349881d5a445cd110abf698cc94d490d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-26Merge commit '52567e8198669a1e7493c75771613f87a90466c3'Hendrik Leppkes
* commit '52567e8198669a1e7493c75771613f87a90466c3': get_bits: Drop some TRACE-level debug code Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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-22lavc/get_bits: add a logging context to check_marker()Clément Bœsch
Based on d338abb664febbc2c7266af7818aab1f12dbc161
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-22get_bits: Drop some TRACE-level debug codeDiego Biurrun
It will not be provided by the new bit reader anyway.
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-16Move check_marker() from get_bits to mpeg4videodecAlexandra Hájková
MPEG-4 is the only decoder which uses check_marker(). Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-01-11lavc: Add get_bitsz()Andreas Cadhalpun
get_bit variant supporting 0-bits reads. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2016-01-11get_bits: Support max_depth > 2 in GET_RL_VLC_INTERNALKieran Kunhya
2016-01-03get_bits: add get_bitsz for reading 0-25 bitsAndreas Cadhalpun
This can be used to simplify code in a couple of places. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-12-14get_bits: Support max_depth > 2 in GET_RL_VLC_INTERNALKieran Kunhya
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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-04-14avcodec/get_bits: print details of the location of the missing bit in ↵Michael Niedermayer
check_marker() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-03get_bits: remove unused assignmentVittorio Giovara
Bug-Id: CID 1238816
2014-09-05Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'Michael Niedermayer
* commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611': get_bits: Add OPEN_READER macro variant w/o size_plus8 Conflicts: libavcodec/get_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05get_bits: Add OPEN_READER macro variant w/o size_plus8Diego Biurrun
This avoids a trillion warnings from MSVC.
2014-09-03Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'Michael Niedermayer
* commit '91d305790ea0f6fe0f54b48236da42181c39c18b': get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE Conflicts: libavcodec/golomb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLEDiego Biurrun
The HAVE_ prefix is reserved for macros set by configure.
2014-08-11avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened ↵Michael Niedermayer
reader Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16get_bits: remove unused assignmentTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> 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-05-10avcodec: better level/index printingMatthew Lindner
2014-05-09avcodec: include GET_RL_VLC() in trace outputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22Various small spelling fixes.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-10-30avcodec/get_bits: add skip_1stop_8data_bitsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30skip_bits: dont call UPDATE_CACHEMichael Niedermayer
UPDATE_CACHE isnt needed and can cause segfaults Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30avcodec/get_bits: place volatile at the right spotMichael Niedermayer
Should fix Ticket2825 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30avcodec/get_bits: init_state is used for thread sync, make it volatileMichael 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-05get_bits: add get_bits_le()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-30get_xbits: assert validity of the number of bitsMichael Niedermayer
similar is already done in the other get_bits() functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-20get_bits: Return pointer to buffer that is the result of the alignmentRonald S. Bultje
This allows more transparent mixing of get_bits and whole-byte access without having to touch get_bits internals. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-02-11get_bits: return pointer to buffer that is the result of the alignment.Ronald S. Bultje
This allows more transparent mixing of get_bits and whole-byte access without having to touch get_bits internals. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'Michael Niedermayer
* commit '4af5310d29379283553bcd9f541a3f6c317f706e': get_bits/put_bits: K&R formatting cosmetics Conflicts: libavcodec/get_bits.h libavcodec/put_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21get_bits/put_bits: K&R formatting cosmeticsDiego Biurrun
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-21Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'Michael Niedermayer
* commit '68f18f03519ae550e25cf12661172641e9f0eaca': videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL dsputil: drop non-compliant "fast" qpel mc functions get_bits: change the failure condition in init_get_bits Conflicts: libavcodec/get_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20get_bits: change the failure condition in init_get_bitsLuca Barbato
Too much code relies in having init_get_bits fed with a valid buffer and set its dimension to 0. Check for NULL buffer instead.
2013-01-14init_get_bits: fix off by 1 errorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14init_get_bits8: zero pointers & struct on errorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14init_get_bits8: check byte_size against being positiveMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'Michael Niedermayer
* commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de': pcx: return meaningful error codes. tmv: return meaningful error codes. msrle: return meaningful error codes. cscd: return meaningful error codes. yadif: x86: fix build for compilers without aligned stack lavc: introduce the convenience function init_get_bits8 lavc: check for overflow in init_get_bits Conflicts: libavcodec/cscd.c libavcodec/pcx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14lavc: introduce the convenience function init_get_bits8Luca Barbato
Accept the buffer size in bytes and check for overflow before passing the value in bits to init_get_bits.
2013-01-14lavc: check for overflow in init_get_bitsLuca Barbato
Fix an undefined behaviour and make the function return a proper error in case of overflow. CC: libav-stable@libav.org
2012-12-08Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'Michael Niedermayer
* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f': parser: fix large overreads bitstream: add get_bits64() to support reading more than 32 bits at once arm: detect cpu features at runtime on Linux Conflicts: libavcodec/parser.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08get_bits: rename get_bits_longlong to get_bits64Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>