Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
AgeCommit message (Collapse)Author
2014-07-10Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'Michael Niedermayer
* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f': mov: free the dv demux context with avformat_free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09mov: free the dv demux context with avformat_free_context()Anton Khirnov
2014-07-08Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'Michael Niedermayer
* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294': mov: Remove a variable that is set but never used Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08mov: Remove a variable that is set but never usedMartin Storsjö
This silences a warning with gcc. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-05Do not detect jp2 images as mov files.Carl Eugen Hoyos
2014-07-01Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'Michael Niedermayer
* commit '20f95f21f9b9595608ba668a6eca78f2d508be67': mov: Support default-base-is-moof. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01mov: Support default-base-is-moof.Yusuke Nakamura
default-base-is-moof shall be set to track fragments compatible with DASH Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH. This is meaningful only when base-data-offset-present is absent and two or more track fragments are present in a movie fragment. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-06avformat/mov: fix "warning: variable altitude set but not used" warningMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'Michael Niedermayer
* commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c': mov: Export geotag metadata fields Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06mov: Export geotag metadata fieldsMartin Storsjö
The '?xyz' form is used by android devices (and according to apple mailing list archives, also by older iOS devices). The 'loci' field (defined in 3GPP 26.244) is used by recent iOS devices. Even though the loci field can contain an altitude, it was plain 0 in my sample. Just export longitude and latitude, in a string format matching the one used by the '?xyz' metadata field. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-31Read mov files where the moov atom is hidden within a free atom.Carl Eugen Hoyos
Fixes ticket #1551 / issue 2226.
2014-05-26avformat/mov: allow seeking back to the begin even if nothing is marked as ↵Michael Niedermayer
keyframe Fixes Ticket 3663 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-24avformat/mov: use av_display_rotation_get() for rotate metadata.Clément Bœsch
2014-05-23avformat/mov: Dont blindly trust the stream duration in seting chapter timesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'Michael Niedermayer
* commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043': mov: store display matrix in a stream side data Conflicts: libavformat/isom.h libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19mov: store display matrix in a stream side dataVittorio Giovara
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-15libavformat/mov: Elimitate double reading of COVR metadata if ↵Alex Sukhanov
MOV_EXPORT_ALL_METADATA is enabled Problem: ffmpeg tries to read COVR atom data twice if MOV_EXPORT_ALL_METADATA is enabled. If COVR atom is the last in the stream, a parsing of such file fails. Solution: just return immediatelly after mov_read_covr Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'Michael Niedermayer
* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f': mov: export stsd Compressorname in metadata Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01mov: export stsd Compressorname in metadataAnton Khirnov
Stop using the undocumented to-be-deprecated AVCodecContext.codec_name field.
2014-04-10avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'Michael Niedermayer
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431': mov: read hydrogenaudio replaygain information Conflicts: libavformat/Makefile libavformat/mov.c See: 37a15f3e669372075c88254e070c971aecb485aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10mov: read hydrogenaudio replaygain informationAnton Khirnov
2014-04-07avformat/mov: reset drefs_count in closeSchenk, Michael
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06avformat/mov: Fix width/height typoMichael Niedermayer
Fixes CID1197050 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'Michael Niedermayer
* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02lavf: add supported extension to avi and mov demuxersMarc-Antoine Arnaud
2014-04-02More correct printf format specifiersDiego Biurrun
This avoids compiler warnings about argument and specifier type mismatch.
2014-03-31Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'Michael Niedermayer
* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8': mov: fill in subtitle dimensions after parsing tkhd See: 8ba432bc56f2d3ef534be7d3ccc1c9b3c0ea3091 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhdMichael Niedermayer
This also moves mov_rewrite_dvd_sub_extradata() to mov.c. Sample-Id: NeroRecodeSample.mp4
2014-03-31mov: fill in subtitle dimensions after parsing tkhdMichael Niedermayer
Sample-Id: NeroRecodeSample.mp4
2014-03-17avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions ↵Michael Niedermayer
from tkhd This also moves mov_rewrite_dvd_sub_extradata() to mov.c Fixes: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17avformat/mov: fill in subtitle dimensions after parsing tkhdMichael Niedermayer
Sample: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15avformat/mov: decode compilation metadataPeter Ross
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>
2014-03-12Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* cehoyos/master: Revert "Allow stream-copying grayscale mov files." Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12avformat: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430Michael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer
* 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>
2014-03-11Revert "Allow stream-copying grayscale mov files."Carl Eugen Hoyos
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.
2014-03-11lavf: more correct printf format specifiersDiego Biurrun
2014-03-09movdec: handle 0x7fff langcode as macintosh per the specsBaptiste Coudurier
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.
2014-02-27avformat/mov: simplify code setting needs_parsingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-23Support old qclp-in-mov files that do not store bytes_per_frame in the header.Carl Eugen Hoyos
Fixes ticket #2649.
2014-02-20avformat/mov: make invalid sampledelta error more verboseMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16avformat/mov: fix avg_frame_rate calculationMichael Niedermayer
Fixes integer overflow Fixes Ticket3390 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12avformat/mov: fix keyframe flags for sample from chromium Issue 340865Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22avformat/mov: redesign the fps calculationMichael Niedermayer
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>
2014-01-21avformat/mov: Ignore the last frame for duration and fps calculation if it ↵Michael Niedermayer
looks suspect The used heuristic will potentially need to be finetuned Fixes daemon404s fps.mov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20mov: do not set avg_frame_rate in the demuxerJustin Ruggles
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>
2014-01-15Merge commit '2620df13104ddaa136158eb6bb1195adbf9d7692'Michael Niedermayer
* commit '2620df13104ddaa136158eb6bb1195adbf9d7692': mov: Free an earlier allocated array if allocating a new one Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-15Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'Michael Niedermayer
* commit 'd51f09962d5b4bc999fb70c040f330dd1873212e': mov: Free intermediate arrays in the normal cleanup function Conflicts: libavformat/mov.c See: a6b3e6d0b49b47c9b874e59b88a8051af338f520 Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 03:38:14 +0300