summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
Commit message (Collapse)AuthorAge
* avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()Michael Niedermayer2014-04-10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'Michael Niedermayer2014-04-10
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '9a07fac678a8540d076e635061bbaa4ed09a9431': mov: read hydrogenaudio replaygain information Conflicts: libavformat/Makefile libavformat/mov.c See: 37a15f3e669372075c88254e070c971aecb485aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: read hydrogenaudio replaygain informationAnton Khirnov2014-04-10
| |
* | avformat/mov: reset drefs_count in closeSchenk, Michael2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Fix width/height typoMichael Niedermayer2014-04-05
| | | | | | | | | | Fixes CID1197050 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | * commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add supported extension to avi and mov demuxersMarc-Antoine Arnaud2014-04-02
| |
* | Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * More correct printf format specifiersDiego Biurrun2014-04-02
| | | | | | | | This avoids compiler warnings about argument and specifier type mismatch.
| * mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhdMichael Niedermayer2014-03-31
| | | | | | | | | | | | This also moves mov_rewrite_dvd_sub_extradata() to mov.c. Sample-Id: NeroRecodeSample.mp4
* | Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'Michael Niedermayer2014-03-31
|\| | | | | | | | | | | | | | | * commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8': mov: fill in subtitle dimensions after parsing tkhd See: 8ba432bc56f2d3ef534be7d3ccc1c9b3c0ea3091 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: fill in subtitle dimensions after parsing tkhdMichael Niedermayer2014-03-31
| | | | | | | | Sample-Id: NeroRecodeSample.mp4
* | avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions ↵Michael Niedermayer2014-03-17
| | | | | | | | | | | | | | | | | | from tkhd This also moves mov_rewrite_dvd_sub_extradata() to mov.c Fixes: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: fill in subtitle dimensions after parsing tkhdMichael Niedermayer2014-03-17
| | | | | | | | | | Sample: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: decode compilation metadataPeter Ross2014-03-15
| | | | | | | | | | | | | | This flag is known as 'Part of a compilation' in Apple iTunes. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-03-12
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Revert "Allow stream-copying grayscale mov files." Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Revert "Allow stream-copying grayscale mov files."Carl Eugen Hoyos2014-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 691dec62011fe9993809fbc793126b40cac0c584. The commit did not fix ticket #3215, it was fixed one commit earlier. The revert may break other use-cases but they should be fixed differently, the offending commit introduced too many problems. Fixes ticket #3377. Fixes ticket #3378.
* | | avformat: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430Michael Niedermayer2014-03-12
| | | | | | | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | 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
| |
| * movdec: handle 0x7fff langcode as macintosh per the specsBaptiste Coudurier2014-03-09
| | | | | | | | | | | | The correct point that seperates ISO and MAC language codes is 0x400 according to the current QT spec. Old QT specs did not list where this seperation is but apparently only defined the meaning of the first 137.
| * mov: do not set avg_frame_rate in the demuxerJustin Ruggles2014-01-20
| | | | | | | | | | | | | | | | | | | | | | The track duration is often not reliable or is not the duration represented by the number of frames. In those cases, avg_frame_rate was reported incorrectly. Removing this code falls back to the default calculation in avformat_find_stream_info(). This is a partial revert of commit c3aeaa540. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/mov: simplify code setting needs_parsingMichael Niedermayer2014-02-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support old qclp-in-mov files that do not store bytes_per_frame in the header.Carl Eugen Hoyos2014-02-23
| | | | | | | | Fixes ticket #2649.
* | avformat/mov: make invalid sampledelta error more verboseMichael Niedermayer2014-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: fix avg_frame_rate calculationMichael Niedermayer2014-02-16
| | | | | | | | | | | | | | Fixes integer overflow Fixes Ticket3390 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: fix keyframe flags for sample from chromium Issue 340865Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: redesign the fps calculationMichael Niedermayer2014-01-22
| | | | | | | | | | | | | | This uses STTS and TRUN information to calculate the fps It seems to work with more files than the previous code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Ignore the last frame for duration and fps calculation if it ↵Michael Niedermayer2014-01-21
| | | | | | | | | | | | | | | | | | looks suspect The used heuristic will potentially need to be finetuned Fixes daemon404s fps.mov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2620df13104ddaa136158eb6bb1195adbf9d7692'Michael Niedermayer2014-01-15
|\| | | | | | | | | | | | | * commit '2620df13104ddaa136158eb6bb1195adbf9d7692': mov: Free an earlier allocated array if allocating a new one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Free an earlier allocated array if allocating a new oneMartin Storsjö2014-01-15
| | | | | | | | | | | | | | | | | | | | | | It could probably also be considered an error if the pointer isn't null at this point, but then we might risk rejecting some slightly broken files that we might have handled so far. Sample-Id: 00000496-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'Michael Niedermayer2014-01-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd51f09962d5b4bc999fb70c040f330dd1873212e': mov: Free intermediate arrays in the normal cleanup function Conflicts: libavformat/mov.c See: a6b3e6d0b49b47c9b874e59b88a8051af338f520 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Free intermediate arrays in the normal cleanup functionMartin Storsjö2014-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | These arrays are normally freed at the end of mov_read_trak, but make sure they're freed in case mov_read_trak returned early (due to errors) or in case the atoms that allocate arrays are encountered at some other point than within a trak (which we don't have checks against). Sample-Id: 00000496-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/flashsv: check avio_read() return in mov_read_udta_string()Michael Niedermayer2014-01-14
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f3f90a8606a_3018_Sequence_1-Apple_ProRes_422_LT.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: clear padding area in mov_read_extradata()Michael Niedermayer2013-12-28
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7f58816b71e3_7025_mov_svq3___svq3_weird_prediction2.mov Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: check avio_read() return in mov_read_dref()Michael Niedermayer2013-12-27
| | | | | | | | | | | | | | Fixes: msan_uninit-mem_7f4960453a02_7264_mr_cork_jpeg.mov Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: use ff_get_extradata()Michael Niedermayer2013-12-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: check avio_read return in mov_read_dvc1()Michael Niedermayer2013-12-25
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f46d5199ee1_9456_vc1-wmapro.ism Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Allow stream-copying grayscale mov files.Carl Eugen Hoyos2013-12-24
| | | | | | | | | | | | | | This reverts 0de2157f / r12272. Fixes ticket #3215. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Do not compute a grayscale palette for cinepak in mov.Carl Eugen Hoyos2013-12-24
| | | | | | | | | | | | | | | | | | This was never done for avi files, the decoder always produced output no matter if a palette was computed or not. Since a non-standard palette was needed, this simplifies the code. See issue 1067 and ticket #165. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Check avio_read() return code in mov_read_extradata() and ↵Michael Niedermayer2013-12-15
| | | | | | | | | | | | | | | | | | shrink the extradata if needed / return an error Fixes use of uninitialized data Fixes: msan_uninit-mem_7ff57193e77e_2715_RAW512K_Stream_004.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: use rfps_add_frame() only for videoMichael Niedermayer2013-12-07
| | | | | | | | | | | | it makes no sense for other streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: calculate rfps from the first 100 frames of the indexMichael Niedermayer2013-12-05
| | | | | | | | | | | | This reduces the amount of frames that need to be demuxed in av_find_stream_info() 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
| |
* | avformat/mov: Check that we have a stream before accessing it in mov_read_ares()Michael Niedermayer2013-11-22
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: signal_sigsegv_6f1855_3910_avid_test_alpha.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
| * mov: Support HEVC demuxingYusuke Nakamura2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/mov: only force parsing for video tracks if stss is emptyHendrik Leppkes2013-11-08
| | | | | | | | | | | | | | Fixes playback of some AAC streams, which are otherwise mangled by the parser, and stss is typically only valid for video anyway. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 18:42:38 +0000