summaryrefslogtreecommitdiffstats
path: root/libavcodec/on2avc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd'Michael Niedermayer2015-06-121-1/+1
|\ \ | |/ | | | | | | | | | | * commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd': on2avc: Use the integer abs() version Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * on2avc: Use the integer abs() versionVittorio Giovara2015-06-121-1/+1
| | | | | | | | | | Fixes clang warning "floating point absolute value function 'fabsf' when argument is of integer type [-Wabsolute-value]".
* | avcodec/on2avc: Check run more carefullyMichael Niedermayer2015-05-141-4/+4
| | | | | | | | | | | | Fixes CID1239106 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix clobbered ff_get_buffer()Paul B Mahol2015-02-101-6/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/on2avc: use init_get_bits8()Paul B Mahol2015-02-041-1/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'Michael Niedermayer2014-12-191-0/+1
|\ \ | |/ | | | | | | | | | | | | * commit 'cee4490b521fd0d02476d46aa2598af24fb8d686': on2avc: check number of channels See: 550f3e9df3410b3dd975e590042c0d83e20a8da3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * on2avc: check number of channelsMichael Niedermayer2014-12-191-0/+4
| | | | | | | | | | | | | | | | | | Fixes invalid memory access. CC: libav-stable@libav.org Bug-ID: CVE-2014-8549 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * on2avc: Fix out of array accessMichael Niedermayer2014-11-151-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1206648
* | avcodec/on2avc: Use avpriv_float_dsp_alloc()Michael Niedermayer2014-11-291-21/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/on2avc: Check number of channelsMichael Niedermayer2014-10-041-0/+5
| | | | | | | | | | | | | | | | Fixes out of array access Fixes: asan_heap-oob_4da4f3_7_asan_heap-oob_4da4f3_173_Xmen_avc_500.vp6 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/on2avc: Fix out of array accessMichael Niedermayer2014-07-021-1/+1
| | | | | | | | | | | | Fixes CID1206648 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0'Michael Niedermayer2014-05-271-1/+0
|\ \ | |/ | | | | | | | | | | * commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0': on2avc: Remove pointless dsputil.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * on2avc: Remove pointless dsputil.h #includeDiego Biurrun2014-05-271-1/+0
| |
* | lavc/on2avc: silent warnings about const paramsLukasz Marek2014-05-111-2/+2
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'Michael Niedermayer2014-04-231-4/+4
|/ | | | | | | | | | | | | | * commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd': On2 AVC decoder Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* On2 AVC decoderKostya Shishkov2014-04-231-0/+1015
OpenPOWER on IntegriCloud