summaryrefslogtreecommitdiffstats
path: root/libavformat/iff.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat/id3v2: Remove unnecessary indirectionAndreas Rheinhardt2020-05-251-2/+2
| | | | | | | | | ff_id3v2_parse_apic/chapters/priv/priv_dict all had a parameter extra_meta of type ID3v2ExtraMeta ** as if the functions wanted to make *extra_meta point to something else. But they don't, so just use an ID3v2ExtraMeta *. Signed-off-by: Andreas Rheinhardt <[email protected]>
* avformat/iff: Use ff_alloc_extradataAndreas Rheinhardt2019-12-111-8/+7
| | | | | | | | Besides improved readability it also zeroes the padding which has been forgotten here. Signed-off-by: Andreas Rheinhardt <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/iff: fix memleak when get st->codecpar->extradata failed in ↵Steven Liu2019-10-101-1/+4
| | | | | | | iff_read_header Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Steven Liu <[email protected]>
* lavf: Constify the probe function argument.Carl Eugen Hoyos2019-03-211-1/+1
| | | | | Reviewed-by: Lauri Kasanen Reviewed-by: Tomas Härdin
* avformat: fix id3 chaptersLukas Stabe2017-10-051-1/+2
| | | | | | | | | | | These changes store id3 chapter data in ID3v2ExtraMeta and introduce ff_id3v2_parse_chapters to parse them into the format context if needed. Encoders using ff_id3v2_read, which previously parsed chapters into the format context automatically, were adjusted to call ff_id3v2_parse_chapters. Signed-off-by: wm4 <[email protected]>
* lavf: use av_fourcc2str() where appropriateClément Bœsch2017-03-291-2/+2
|
* avformat: fix overflows during bit rate calculationAndreas Cadhalpun2016-12-141-1/+1
| | | | | | | | The bit_rate field has type int64_t since commit 7404f3bdb90e6a5dcb59bc0a091e2c5c038e557d. Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]>
* avformat/iff: parse DPAN chunkPaul B Mahol2016-05-191-0/+6
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avcodec/iff: add support for ANIMs with keyframes and concatenated ANIMsPaul B Mahol2016-05-161-4/+11
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avcodec: add Direct Stream Transfer (DST) decoderPeter Ross2016-05-151-7/+78
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* lavc: add IFF ANIM decoderPaul B Mahol2016-05-131-21/+67
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avformat/iff: fix deadlock in parsing dsd chunksPaul B Mahol2016-04-301-2/+2
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis2016-04-101-80/+80
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <[email protected]> - Hendrik Leppkes <[email protected]> - wm4 <[email protected]> - Clément Bœsch <[email protected]> - James Almer <[email protected]> - Michael Niedermayer <[email protected]> - Rostislav Pehlivanov <[email protected]> Merged-by: Derek Buitenhuis <[email protected]>
| * lavf: replace AVStream.codec with AVStream.codecparAnton Khirnov2016-02-231-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
* | Replace remaining occurances of av_free_packet with av_packet_unrefHendrik Leppkes2015-10-271-1/+1
| |
* | avformat/iff: check for possible overflow in 2nd argument of av_new_packetPaul B Mahol2015-09-251-0/+4
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <[email protected]>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-141-1/+1
| |
* | libavformat/iff: print error message when DSDIFF compression type is not ↵Peter Ross2014-09-261-1/+7
| | | | | | | | | | | | | | supported Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: rudimentary support for animationsPaul B Mahol2014-08-181-0/+6
| | | | | | | | | | | | For now only first frame is decoded. Signed-off-by: Paul B Mahol <[email protected]>
* | replace calls to url_feof() with avio_feof()James Almer2014-08-081-1/+1
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: Fix "source comment"Michael Niedermayer2014-08-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunksPeter Ross2014-04-201-8/+271
| | | | | | | | | | Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: indentPeter Ross2014-04-131-15/+15
| | | | | | | | | | Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: remove unused codePeter Ross2014-04-131-6/+0
| | | | | | | | | | | | | | bits_per_coded_sample and block_align are calculated again at end of if() block Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-111-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd92024f18fa3d69937cb2575f3a8bf973df02430': lavf: more correct printf format specifiers Conflicts: libavformat/asfdec.c libavformat/cafdec.c libavformat/dxa.c libavformat/framecrcenc.c libavformat/hnm.c libavformat/iff.c libavformat/mov.c libavformat/mxfdec.c libavformat/rmdec.c libavformat/rpl.c libavformat/smacker.c libavformat/xmv.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: more correct printf format specifiersDiego Biurrun2014-03-111-1/+3
| |
* | avformat/iff: check avio_read() return in get_metadata()Michael Niedermayer2013-12-291-1/+1
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7f9539ba8461_4760_dasboot_in_compressed Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: fix memleak of packetMichael Niedermayer2013-12-151-1/+3
| | | | | | | | | | | | Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: shrink packets to the initialized dataMichael Niedermayer2013-12-151-0/+2
| | | | | | | | | | | | | | Fixes use of uninitialized data Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/iff: Byte seek is unsupportedMichael Niedermayer2013-06-201-1/+1
| | | | | | | | | | | | Fixes Ticket2194 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'Michael Niedermayer2013-03-181-2/+5
|\| | | | | | | | | | | | | | | | | | | | | * commit '50c449ac24fbb4c03c15d2e2026cef2204b80385': iff: validate CMAP palette size asfenc: return error on negative timestamp Conflicts: libavformat/iff.c Merged-by: Michael Niedermayer <[email protected]>
| * iff: validate CMAP palette sizeKostya Shishkov2013-03-181-0/+5
| | | | | | | | | | | | | | | | | | Fixes CVE-2013-2495 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Luca Barbato <[email protected]> CC: [email protected]
* | lavc & lavf: replace deprecated av_log* functionsPaul B Mahol2013-03-151-2/+2
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | iff: fix integer overflowMichael Niedermayer2013-03-051-0/+3
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | iff: support seeking with maudPaul B Mahol2013-01-071-7/+8
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | iff demuxer: support RGB8 and RGBNPeter Ross2012-12-111-1/+5
| |
* | iff demuxer: include DEEP TVDC lookup table in extradata bufferPeter Ross2012-12-041-1/+12
| | | | | | | | Signed-off-by: Peter Ross <[email protected]>
* | iff: fix some incorrect interpretations of invalid filesPaul B Mahol2012-11-301-3/+4
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | iff: MAUD supportPaul B Mahol2012-11-301-5/+61
| | | | | | | | | | Based on patch by Piotr Bandurski Signed-off-by: Paul B Mahol <[email protected]>
* | iff demuxer: 16SV supportPaul B Mahol2012-11-281-1/+7
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | iff demuxer: don't bother checking bitmap compression type; iff decoder does ↵Peter Ross2012-11-261-24/+2
| | | | | | | | | | | | | | this now Signed-off-by: Peter Ross <[email protected]> Reviewed-by: Paul B Mahol <[email protected]>
* | iff: DEEP RLE 32-bit decoderPeter Ross2012-11-201-1/+1
| | | | | | | | | | | | Fixes ticket #1046. Signed-off-by: Peter Ross <[email protected]>
* | iff: process DEEP DLOC chunk to obtain image dimensionsPeter Ross2012-11-181-0/+8
| | | | | | | | | | Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | iff: recognise more DEEP colorspacesPeter Ross2012-11-181-0/+9
| | | | | | | | | | Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'Michael Niedermayer2012-11-131-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits) jvdec: set channel layout iss: set channel layout ipmovie: set channel layout iff: set channel layout idroqdec: set channel layout gxfdec: set channel layout when applicable gsmdec: set channel layout flvdec: set channel layout dv: set channel layout dsicin: set channel layout daud: set channel layout cdxl: set channel layout bmv: set channel layout bink: set channel layout bfi: set channel layout bethsoftvid: set channel layout apc: set channel layout amr: set channel_layout ppc: replace pointer casting with AV_COPY32 ppc: fix some unused variable warnings ... Conflicts: libavformat/amr.c libavformat/iff.c Merged-by: Michael Niedermayer <[email protected]>
| * iff: set channel layoutJustin Ruggles2012-11-121-1/+9
| |
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
* | lavf: add missing new line to some error messagesPiotr Bandurski2012-09-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>