summaryrefslogtreecommitdiff
path: root/libavformat/mxfdec.c
Commit message (Collapse)AuthorAge
* avformat/mxfdec: cleanup if parsing the header metadata failsMichael Niedermayer2014-10-15
| | | | | | | Fixes memleaks Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mxfdec: Fix memleak of packages_refsMichael Niedermayer2014-10-15
| | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mxfdec: Fix memleak of primer_packsMichael Niedermayer2014-10-15
| | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mxfdec: Fix termination of mxf_data_essence_container_ulsMichael Niedermayer2014-10-15
| | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mxfdec: read reel_name and source timecode from physical source packageMark Reid2014-10-07
| | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110'Michael Niedermayer2014-08-17
|\ | | | | | | | | | | | | * commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110': mxf: Support AAC Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Support AACLuca Barbato2014-08-17
| | | | | | | | | | | | | | Update mxf_set_audio_pts to use the container-provided information. The UL is marked as "to be changed in the future", but the current samples in the wild do use it.
* | Merge commit '747cd9560c2248ff2834f29cd2190646330e4676'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '747cd9560c2248ff2834f29cd2190646330e4676': mxf: Add the UL for the MPEG2VideoDescriptor Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add the UL for the MPEG2VideoDescriptorLuca Barbato2014-08-17
| |
* | Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '304089aca7d238ae184e09993b5c737aa22e2c2c': mxf: Add UID print helpers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add UID print helpersLuca Barbato2014-08-17
| | | | | | | | And use it to print non-parsed ULs.
* | Use new av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: add missing "const" to array declaration.Reimar Döffinger2014-07-30
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | * commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8': mxf: Extract origin information from material and source track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Extract origin information from material and source trackMarc-Antoine Arnaud2014-07-28
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'c9d982aa11a6267611c3770792f0e04b48438348'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | * commit 'c9d982aa11a6267611c3770792f0e04b48438348': mxf: Detect Vanc/Vbi SMPTE-436M mxf track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Detect Vanc/Vbi SMPTE-436M mxf trackMarc-Antoine Arnaud2014-07-28
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'Michael Niedermayer2014-04-04
|\| | | | | | | | | | | | | | | | | * commit 'ad8f736b7404503d8f5164f4879175a2258dd64b': mxf: Remove typo also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Remove typoLuca Barbato2014-04-03
| | | | | | | | Reported-By: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'Michael Niedermayer2014-03-19
|\| | | | | | | | | | | | | | | | | | | * commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004': mxf: Lowercase UL strings Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Lowercase UL stringsLuca Barbato2014-03-19
| | | | | | | | The specification uses lower case most of the time.
* | Merge commit '842ea36c747eb6537c4236114346cb7a3e9a8df1'Michael Niedermayer2014-03-19
|\| | | | | | | | | | | | | * commit '842ea36c747eb6537c4236114346cb7a3e9a8df1': mxf: Override faulty PreviousPartition entries Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Override faulty PreviousPartition entriesLuca Barbato2014-03-19
| | | | | | | | | | | | | | | | | | | | Some files set the PreviousPartition field to point to its own offset. If we are parsing forward the Previous partition is immediately known and its value could be used, otherwise we can safely point to the header. Reported-By: Jean Baptiste Kempf <jb@videolan.org>
* | Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * lavf: more correct printf format specifiersDiego Biurrun2014-03-11
| |
* | Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'Michael Niedermayer2014-03-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf': mxfdec: Validate parameters to strftime Conflicts: libavformat/mxfdec.c See: 423089e964410adbf13af3de42e3c9dd5a1babd6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: Validate parameters to strftimeMartin Storsjö2014-03-10
| | | | | | | | | | | | | | | | | | | | | | | | The MSVCRT version of strftime calls the invalid parameter handler if the struct values in struct tm are invalid. In case no invalid parameter handler is set for the process, the process is aborted. This fixes fate failures on MSVC builds since 570af382. Based on a patch by Hendrik Leppkes. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | * commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8': mxf: Return meaningful errors Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Return meaningful errorsLuca Barbato2014-03-06
| |
* | Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6': mxf: Parse random index pack Conflicts: libavformat/mxfdec.c See: f5ed83c3831fcaca0f87cd67ca743946a54023d0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Parse random index packPaul B Mahol2014-03-06
| | | | | | | | | | | | | | | | | | | | Get the last partition offset and 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: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '570af382eea902afe09f3562e5e1b483981cca7e': mxf: Handle identification metadata Conflicts: libavformat/mxfdec.c See: 25b143aa7bd60d348a449be64dadab61f0c7d068 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Handle identification metadataMatthieu Bouron2014-03-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416': mxf: Set audio packets pts Conflicts: libavformat/mxfdec.c See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Set audio packets ptsMatthieu Bouron2014-03-06
| | | | | | | | | | | | | | | | | | | | | | Extrapolate audio timestamps based on the number of samples demuxed. Deal with some MXF nastiness involving fractional number of samples per EditUnit when seeking (the specs handwave this away). Further fixes from Tomas Härdin. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxfdec: free descriptor extradata in .read_close()Janne Grunau2014-02-09
| | | | | | | | Fixes memleak in fate-mxf-demux.
* | Merge commit 'c716624853339ea4b1086a3957b334829370204c'Michael Niedermayer2014-02-02
|\| | | | | | | | | | | | | | | | | | | * commit 'c716624853339ea4b1086a3957b334829370204c': mxf: Read field dominance flag Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Read field dominance flagMatthieu Bouron2014-02-01
| | | | | | | | | | | | And export the information in field_order. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'Michael Niedermayer2014-02-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '7d56f2fffc14ad02001ee0689bee76a759da9ede': mxf: Handle negative edit_rate Conflicts: libavformat/mxfdec.c See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Handle negative edit_rateLuca Barbato2014-02-01
| | | | | | | | Default to 1/25.
| * mxf: Fix potential leak in mxf_read_local_tags()Tomas Härdin2014-01-14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxf: Correctly support files from Pinnacle ThunderTomas Härdin2014-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such files have IndexTableSegments which when parsed cover EditUnit ranges like this: [0,1) [249,250) [249,377) [0,249) where each interval is [IndexStartPosition, IndexStartPosition + IndexDuration) This would be reduced to a sparse index like: [0,1), [249,250) instead of the full range: [0,249), [249,377) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxf: Fix a possible leak of extradataMichael Niedermayer2014-01-14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/mxfdec: fix typo in error check of mxf_edit_unit_absolute_offset()Michael Niedermayer2014-01-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'Michael Niedermayer2014-01-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf': mxf: Use av_malloc_array Conflicts: libavformat/mxfdec.c See: 8ce41721a4a29711211f8dad0c86502caf86f4d3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Use av_malloc_arrayLuca Barbato2014-01-14
| |
| * mxf: Drop unnecessary checksLuca Barbato2014-01-14
| | | | | | | | av_reallocp_array does the check already.
* | Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'Michael Niedermayer2014-01-14
|\| | | | | | | | | | | | | | | | | | | | | * commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084': mxf: Fix off by one error in d10 aes3 decoding Conflicts: libavformat/mxfdec.c See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Fix off by one error in d10 aes3 decodingMarton Balint2014-01-14
| | | | | | | | Without this fix the last sample was missing from the packet.