summaryrefslogtreecommitdiff
path: root/libavcodec/pgssubdec.c
Commit message (Collapse)AuthorAgeFilesLines
* pgssubdec: reset rle_data_len/rle_remaining_len on allocation errorAndreas Cadhalpun2017-02-011-1/+4
| | | | | | | | The code relies on their validity and otherwise can try to access a NULL object->rle pointer, causing segmentation faults. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* pgssubdec: only set w/h/linesize when allocating dataAndreas Cadhalpun2016-11-241-4/+5
| | | | | | | Rects with positive w/h/linesize but no data are invalid. Reviewed-by: Petri Hintukainen <phintuka@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'Clément Bœsch2016-06-211-2/+4
|\ | | | | | | | | | | | | * commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376': Reduce the scope of some variables Merged-by: Clément Bœsch <u@pkh.me>
| * Reduce the scope of some variablesDiego Biurrun2016-05-111-2/+4
| | | | | | | | | | This avoids unused variable warnings after the next version bump. Also drop a trace level av_log() call that is in the way.
* | Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'Clément Bœsch2016-06-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | * commit '885a9d6087315a85d98f7e89656ef01dc7104c4c': pgssub: Fix subpicture colorspace and range See 9779b6262471d553c1ed811ff7312564e39d8adf Merged-by: Clément Bœsch <u@pkh.me>
| * pgssub: Fix subpicture colorspace and rangeJan Ekström2016-05-101-2/+8
| | | | | | | | | | | | | | | | | | Widen the values from limited to full range and use BT.709 where it should be used according to the video resolution: SD is BT.601, HD is BT.709 Default to BT.709 due to most observed HDMV content being HD.
| * pgssubdec: fix API compability layerPetri Hintukainen2015-11-261-10/+10
| | | | | | | | | | | | | | Copy pointers to AVPicture after memory has been allocated. Fixes NULL pointers in AVPicture after a17a7661906ba295d67afd80ac0770422e1b02b3. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | pgssubdec: fix subpicture output colorspace and rangeJan Ekström2016-04-241-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functionality used before didn't widen the values from limited to full range. Additionally, now the decoder uses BT.709 where it should be used according to the video resolution. Default for not yet set colorimetry is BT.709 due to most observed HDMV content being HD. BT.709 coefficients were gathered from the first two parts of BT.709 to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2). They were additionally confirmed by manually calculating values. Fixes #4637
* | avcodec/pgssubdec: Fix left shift of 255 by 24 places cannot be represented ↵Michael Niedermayer2015-12-041-1/+1
| | | | | | | | | | | | | | | | | | in type int Fixes: b293a6479bb4b5286cff24d356bfd955/asan_generic_225c3c9_7819_cc526b657450c6cdef1371b526499626.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/pgssubdec: Check dimensions for 0Michael Niedermayer2015-11-141-2/+2
| | | | | | | | | | | | | | | | Fixes division by 0 Fixes: b293a6479bb4b5286cff24d356bfd955/asan_generic_225c3c9_7819_cc526b657450c6cdef1371b526499626.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'Hendrik Leppkes2015-10-221-8/+19
|\ \ | |/ | | | | | | | | | | * commit 'a17a7661906ba295d67afd80ac0770422e1b02b3': lavc: Add data and linesize to AVSubtitleRect Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Add data and linesize to AVSubtitleRectVittorio Giovara2015-10-211-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Use the new fields directly instead of the ones from AVPicture. This removes a layer of indirection which serves no pratical purpose whatsoever, and will help in removing AVPicture structure completely later. Every subtitle encoder/decoder seamlessly points to the new arrays, so it is possible to deprecate AVSubtitleRect.pict. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/pgssubdec: use AV_OPT_TYPE_BOOL for forced_subs_only optionClément Bœsch2015-09-121-1/+1
| |
* | Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer2015-04-201-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara2015-04-191-9/+9
| |
* | avcodec/pgssubdec: Use av_malloc*_array()Michael Niedermayer2015-01-111-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d'Michael Niedermayer2014-08-011-5/+7
|\ \ | |/ | | | | | | | | | | | | * commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d': pgssubdec: Check RLE size before copying See: c0d68be555f5858703383040e04fcd6529777061 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pgssubdec: Check RLE size before copyingMichael Niedermayer2014-08-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the buffer size does not exceed the expected RLE size. Prevent an out of array bound write. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Bug-Id: CVE-2013-0852 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/pgssubdec: Fix input ptsMichael Niedermayer2014-07-121-1/+1
| | | | | | | | | | | | Fixes part of Ticket2516 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: remove unused variablesMichael Niedermayer2014-06-301-3/+0
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()Michael Niedermayer2014-06-301-0/+8
| | | | | | | | | | | | Might fix overread, no testcase known though. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'Michael Niedermayer2014-06-301-120/+239
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772': pgssubdec: handle more complex PGS scenarios Conflicts: libavcodec/pgssubdec.c Some of this has been split out and commited in cleanly split patches immedeately before this merge Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pgssubdec: handle more complex PGS scenariosJohn Stebbins2014-06-301-130/+294
| | | | | | | | | | | | | | | | | | Add ability to handle multiple palettes and objects simultaneously. Each simultaneous object is given its own AVSubtitleRect. Note that there can be up to 64 currently valid objects, but only 2 at any one time can be "presented". Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/pgssubdec: fix end display timeJohn Stebbins2014-06-301-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is setJohn Stebbins2014-06-301-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: better error codesJohn Stebbins2014-06-301-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Pass AVSubtitleRect to decode_rle()John Stebbins2014-06-301-11/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: split out flush_cache()John Stebbins2014-06-301-10/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: do not fail when part of the packet is faulty unless ↵John Stebbins2014-06-301-6/+11
| | | | | | | | | | | | AV_EF_EXPLODE is set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: rename PICTURE_SEGMENTJohn Stebbins2014-06-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Use av_malloc(z)_array()Michael Niedermayer2014-05-221-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'Michael Niedermayer2014-03-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f9279ee74936b4990fc46287c27816ef828cc06c': dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.hDiego Biurrun2014-03-221-1/+1
| |
* | Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'Michael Niedermayer2014-03-141-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '05563ccacc98fd185affdbf8cbaf094caf36b852': dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names Conflicts: libavcodec/bit_depth_template.c libavcodec/motionpixels_tablegen.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl namesDiego Biurrun2014-03-131-1/+1
| | | | | | | | Also switch from "tbl" to "tab" name suffixes.
* | avcodec/pgssubdec: Use av_fast_padded_malloc() for rle bufferMichael Niedermayer2014-01-151-1/+1
| | | | | | | | | | | | | | Fixes: use of uninitialized memeory Fixes: msan_uninit-mem_7fa421d0e222_1765_Girl_With_The_Dragon_Tattoo_2_23_56.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'Michael Niedermayer2013-11-011-10/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f21d8b1b40848973558c737aebe800c46e93a3d': pictordec: stop using deprecated avcodec_set_dimensions pgssubdec: stop using deprecated avcodec_set_dimensions pcx: stop using deprecated avcodec_set_dimensions mpegvideo_parser: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/pcx.c libavcodec/pgssubdec.c libavcodec/pictordec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pgssubdec: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-311-9/+16
| |
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-031-1/+1
| |
* | Fix wrong use of "an" in some comments.Thilo Borgmann2013-08-121-1/+1
| |
* | pgssubdec: remove unused variablePaul B Mahol2012-11-281-1/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13'Michael Niedermayer2012-11-191-6/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c5805521c3e406886341d752ebf38f8d41e1d13': PGS subtitles: Set AVSubtitle pts value configure: Refactor CPPFLAGS settings for glibc/uclibc configure: add basic support for ARM AArch64 build: set -U__STRICT_ANSI__ for newlib Conflicts: configure libavcodec/pgssubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * PGS subtitles: Set AVSubtitle pts valueJohn Stebbins2012-11-181-2/+8
| | | | | | | | | | | | pts should be that of the packet containing the presentation segment. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | pgssubdec: check RLE size before copying. Fix out of array accessesMichael Niedermayer2012-11-151-0/+5
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'Michael Niedermayer2012-11-031-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a07c1332cfe092b57b5758f22b686ca58806c60': parser: Move Doxygen documentation to the header files PGS subtitles: Expose forced flag x86: PMINUB: port to cpuflags Conflicts: libavcodec/avcodec.h libavcodec/pgssubdec.c libavcodec/version.h libavcodec/x86/ac3dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * PGS subtitles: Expose forced flagJohn Stebbins2012-11-021-3/+8
| | | | | | | | | | | | | | Useful for detection of subtitles displayed during foreign language scenes. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-081-1/+1
| |
* | lavc/pgssubdec: use the PTS from the presentation segment.Nicolas George2012-09-151-0/+8
| | | | | | | | | | | | | | According to the sample for trac ticket #1722, PGS subtitles are decoded from several packets at the same DTS and varying PTS. The PTS from the presentation segment seem to be the valid one; in particular, clear subtitles are too early with the other PTS.
View Lorry Controller Status