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
2019-07-18avcodec/parser: Check next index validity in ff_combine_frame()Michael Niedermayer
Fixes: out of array access Fixes: 15522/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DNXHD_fuzzer-5747756078989312 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-07-21avcodec/parser: move parsers list and related API to its own fileJames Almer
And add it to the CONFIGURABLE_COMPONENTS list in Makefile. This way, changes to the new file will be tracked and the usual warning to suggest re-running configure will be shown. Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
2018-03-08sbc: add parser for SBCAurelien Jacobs
2018-02-06lavc: add new API for iterating codecs and codec parsersJosh de Kock
Based on an unfinished patch by atomnuker.
2018-01-05avcodec/parser: use a mutex instead of atomics in av_register_codec_parser()James Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-06-16avcodec/parser: assert that there is a past buffer if theres a reference ↵Michael Niedermayer
into the past Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-05Merge commit '53618054b64ce4dab459d23a7efebe9d5afc4855'James Almer
* commit '53618054b64ce4dab459d23a7efebe9d5afc4855': parser: Add missing #include for printing ISO C99 conversion specifiers Merged-by: James Almer <jamrial@gmail.com>
2017-03-29Fix all -Wformat warnings raised by DJGPPClément Bœsch
2016-12-25parser: Add missing #include for printing ISO C99 conversion specifiersDiego Biurrun
2016-12-23Use correct printf conversion specifiers for POSIX integer typesDiego Biurrun
2016-10-24lavc/parser: export field order if not already setRodger Combs
Some codecs set this in the parser, but not the decoder
2016-04-01avcodec/parser: assert that the codec id is not NONE in av_parser_parse2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-06parser: add av_assert1 to make sure the codec matchesAndreas Cadhalpun
Otherwise this can have some surprising effects (crashes), so let's better not allow it. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-09-29Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'Hendrik Leppkes
* commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d': lavc: Make AVPacket.duration int64, and deprecate convergence_duration Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29lavc: Make AVPacket.duration int64, and deprecate convergence_durationwm4
Note that convergence_duration had another meaning, one which was in practice never used. The only real use for it was a 64 bit replacement for the duration field. It's better just to make duration 64 bits, and to get rid of it. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.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-07-27lavc: AV-prefix all codec flagsVittorio Giovara
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-05-31avcodec/parser: Print an error in case of reallocation fails in ↵Michael Niedermayer
ff_combine_frame() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20avcodec/parser: Remove duplicate header inlcudeMichael 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-19Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'Michael Niedermayer
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49': h264_parser: export video format and dimensions Conflicts: libavcodec/h264_parser.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19h264_parser: export video format and dimensionsAnton Khirnov
2015-02-14avcodec/parser: optimize ff_mpeg4video_split()Zhaoxiu Zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15avcodec/parser: Check that the parser return code is validMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'Michael Niedermayer
* commit '8a9641a652ed1546fedfda22584f79d3d423096e': bsf: check memory allocations Conflicts: libavcodec/noise_bsf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15bsf: check memory allocationsVittorio Giovara
2015-01-07avcodec/parser: add fuzzy mode to ff_fetch_timestamp()Michael Niedermayer
This will be needed for the following timestamp fix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/parser: use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16Drop remaining unneeded != NULLMichael Niedermayer
Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'Michael Niedermayer
* commit '53abe32409f13687c864b3cda077a1aa906a2459': avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as constDiego Biurrun
2014-02-26avcodec/parser: put lost comments backMichael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: parser: cosmetics: Drop some unnecessary parentheses Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'Michael Niedermayer
* commit 'a1c699659d56b76c0bf399307f642c6fd6d28281': parser: K&R formatting cosmetics Conflicts: libavcodec/parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'Michael Niedermayer
* commit 'ed61f3ca8a0664a697782253b354055136c5d303': parser: Remove commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25parser: cosmetics: Drop some unnecessary parenthesesDiego Biurrun
2014-02-25parser: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-02-25parser: Remove commented-out cruftDiego Biurrun
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-09-26avcodec/parser: reset indexes on realloc failureMichael Niedermayer
Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29avcodec/parser: Make av_register_codec_parser() thread safeMichael Niedermayer
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-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-08parser: fix large overreadsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-12-06Revert "Acquire lock when initializing parsers."Michael Niedermayer
This reverts commit 7feef7dbca5f6a816e04b63c17aad5dacd272f6e. This commit causes assertion failures due to use of parser_init from multiple threads, for example indirectly by ffmpeg.c and more directly from the packet read functions. I dont know how to fix this quickly, and fixing ffmpeg.c leaves the possibility of other applications being affected. Crashing the applications until this is resolved is clearly no good thus this revert, so we have time to think about the problem. Crashes can be reproduced by using multiple input files in ffmpeg.