summaryrefslogtreecommitdiff
path: root/libavformat/mxfdec.c
Commit message (Collapse)AuthorAge
...
* | Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'Michael Niedermayer2014-01-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '42f9132218ca11a8e9a3c82a175b46bca092113e': mxf: Do not use int to check the seek position Conflicts: libavformat/mxfdec.c See: 007989c7a2215f54aeaf2393ab3aff0c208e862f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Do not use int to check the seek positionLuca Barbato2014-01-14
| | | | | | | | | | | | Overly large files are to be expected. Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
| * mxf: Set AV_FIELD_PROGRESSIVEReimar Döffinger2014-01-14
| | | | | | | | | | | | Needed for AVC-intra Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxfdec: set extradata sizeAnton Khirnov2013-11-29
| | | | | | | | | | The line setting it was mistakenly removed in ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878
* | avformat/mxfdec: check avio_read(UID) resultMichael Niedermayer2014-01-10
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fc9ba2fd98e_82_02785736.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: detect loops during header parsingMichael Niedermayer2014-01-08
| | | | | | | | | | | | | | | | | | | | | | | | The header parser uses forward and backward parsing, making the bulletproof prevention of loops difficult, thus this simple detection code. If someone improves the forward/backward parsing so it cannot loop then this commit should be reverted Fixes Ticket3278 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
* | Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878': lavf: improve support for AVC-Intra files. Conflicts: libavformat/internal.h libavformat/isom.c libavformat/mxfdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: improve support for AVC-Intra files.Reimar Döffinger2013-11-14
| | | | | | | | | | | | | | | | Generate extradata with SPS/PPS based on container dimensions. Authors of this commit are: Reimar and Thomas Mundt Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mxfdec: update current edit unit when seeking in mxf files without index tablesMarton Balint2013-11-14
| | | | | | | | | | | | | | | | Fixes audio packet pts values in some files generated by AVID TRMG 3.01. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mxf: Add jpeg2000 codec to intra only codecsMatthieu Bouron2013-10-10
| | | | | | | | | | | | Conform with SMPTE RP 224 and SMPTE s422. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/mxfdec: optimize probingMichael Niedermayer2013-11-08
| | | | | | | | | | | | about 71 times faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec; parse random index pack to get last partition offset and ↵Paul B Mahol2013-10-21
| | | | | | | | | | | | | | | | | | use it when footer partition offset is missing Footer partition may not be present and even if present footer partition offset may not be set in any partition except last one. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'Michael Niedermayer2013-10-02
|\| | | | | | | | | | | | | | | | | | | * commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1': mxf: Remove a typo Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Remove a typoLuca Barbato2013-10-01
| | | | | | | | Introduced in 93370d1216
* | Merge commit '93370d12164236d59645314871a1d6808b2a8ddb'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93370d12164236d59645314871a1d6808b2a8ddb': mxfdec: set audio timebase to 1/samplerate Conflicts: libavformat/mxfdec.c tests/ref/fate/mxf-demux tests/ref/seek/lavf-mxf tests/ref/seek/lavf-mxf_d10 See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: set audio timebase to 1/samplerateAnton Khirnov2013-09-29
| | | | | | | | | | | | | | | | Fixes sync in some samples (e.g. bugs 7581 and 8374 in VLC). Based on a commit by Matthieu Bouron <matthieu.bouron@gmail.com> Reported-by: Jean-Baptiste Kempf <jb@videolan.org> CC: libav-stable@libav.org
* | lavf/mxfdec: add j2k codec to intra only codecsMatthieu Bouron2013-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: check sample size more completelyMichael Niedermayer2013-09-27
| | | | | | | | | | | | | | Fixes division by zero Fixes Ticket2992 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: use av_realloc_array()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: functions that add entries should not destroy the whole ↵Michael Niedermayer2013-09-11
| | | | | | | | | | | | | | | | | | | | | | list on failure The caller does not expect this and there are variables left that index to otherwise deallocated data. This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'Michael Niedermayer2013-09-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f369b9356c4606cd4d713d60f7db5de119d901fa': avformat: Use av_reallocp_array() where suitable Conflicts: libavformat/asfenc.c libavformat/gxfenc.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp_array() where suitableAlexandra Khirnova2013-09-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Fix copying extradata to codec in mxfdec.cNigel Touati-Evans2013-06-27
| | | | | | | | | | | | | | | | The code that copies any extradata from the MXFDescriptor to the codec does not set the size, which it should otherwise the copied data is useless. Attached it a patch to correct this. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-16
| |
* | Better handling for MXF essence reading reaching EOF.Joseph Artsimovich2013-05-13
| | | | | | | | | | | | | | | | If no metadata follows MXF essence, that is essence ends with EOF, "Operation not permitted" error was produced and a non-zero code was returned from ffmpeg executable. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf_timestamp_to_str: dont leave uninitilaized fields in time.Michael Niedermayer2013-04-21
| | | | | | | | | | Fixes CID1005318 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: fix return variable type for avio_seekMarton Balint2013-04-19
| | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxfdec: validate month/day before date formattingHendrik Leppkes2013-04-13
| | | | | | | | | | | | | | | | Some implementations of strftime do not like invalid values for month/day, so ensure it doesn't happen. Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxf: fix parsing of timestampsMatthieu Bouron2013-04-13
| | | | | | | | | | | | | | | | | | | | | | Correct bit mask for month/day/hour/min/sec values. For reference the timestamp format specified in S377M is as follow: year (int16), month (uint8), day (uint8), hour (uint8), sec (uint8), msec (uint8). A value of 0 for every fields means timestamp "unknown". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxfdec: use more widely supported time format stringHendrik Leppkes2013-04-13
| | | | | | | | | | | | | | | | MSVC lacks support for %T and %F, but the standard specifies them only as shorthands to the long variants. Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxf: fix parsing of the month from mxf timestampsHendrik Leppkes2013-04-13
| | | | | | | | | | Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: update current edit unit when seeking in mxf files without index tablesMarton Balint2013-04-11
| | | | | | | | | | | | | | | | Fixes audio packet pts values in some files generated by AVID TRMG 3.01. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxfdec: handle identification metadataMatthieu Bouron2013-04-08
| |
* | lavf/mxfdec: read field dominance flagMatthieu Bouron2013-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'Michael Niedermayer2013-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e': avformat: av_log_ask_for_sample() ---> avpriv_request_sample() Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-13
| |
| * mxfdec: fix NULL checking in mxf_get_sorted_table_segments()Xi Wang2013-01-04
| | | | | | | | | | | | | | | | | | | | | | | | The following out-of-memory check is broken. *sorted_segments = av_mallocz(...); if (!sorted_segments) { ... } The correct NULL check should use *sorted_segments. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mxfdec: fix typo in mxf_read_seek()Janne Grunau2012-11-15
| | | | | | | | | | | | | | Check the number of index tables before using byte offset based seeking instead of the index_tables pointer. Found by Måns Rullgård <mans@mansr.com>.
* | lavf: add AV_ to two remaining CODEC_ID_*.Nicolas George2013-03-12
| |
* | Use SMPTE standard notation when showing mxf Universal Labels.Carl Eugen Hoyos2013-02-21
| |
* | Print mxf Universal Label if the user requested verbose logging.Carl Eugen Hoyos2013-02-11
| | | | | | | | Fixes ticket #2198
* | mxfdec: Fix integer overflow with many channelsMichael Niedermayer2013-01-11
| | | | | | | | | | | | | | | | Fixes division by zero Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support more AVC-Intra filesReimar Döffinger2013-01-03
| | | | | | | | | | | | | | | | | | | | | | | | Followup to http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/151321 patch by Reimar and Thomas Mundt fixes some AVC-Intra files from different tickets. It does not fix http://samples.ffmpeg.org/ffmpeg- bugs/trac/ticket524/AVCI50.mov Authors of this commit are: Reimar and Thomas Mundt Patch and commit message mostly taken from ffmpeg-devel, mail by Carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Set AV_FIELD_PROGRESSIVE, needed for AVC-intraReimar Döffinger2013-01-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Rescale audio stream duration from EditRate to SampleRateTomas Härdin2012-12-25
| | | | | | | | | | | | | | Since 83cab07 audio stream time bases are based on SampleRate, not EditRate. This fixes trac ticket #2029 and a few seeking issues. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf_probe: make buffer related pointers constMichael Niedermayer2012-12-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 05:12:05 +0000