0744daa887
Do not print a useless error number if mov header reading fails.
...
The error string is printed by ffmpeg as for other demuxers.
2014-08-24 02:45:58 +02:00
a9f3bb14ba
avformat/mov: use 64bit for size in mov_skip_multiple_stsd()
...
Fixes integer overflow
Fixes Ticket 3866
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-21 17:49:37 +02:00
b07dc81a9e
Merge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea'
...
* commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea':
mov: Drop unused parameter from ff_mov_read_esds()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-19 18:27:51 +02:00
86dfcfd0e3
mov: Drop unused parameter from ff_mov_read_esds()
...
This is cleaner and avoids an uninitialized variable warning with MSVC.
2014-08-19 06:22:07 -07:00
a0941c8a2b
Use new av_dict_set_int helper function.
...
Get rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16 14:31:41 +02:00
81a663f49e
Drop remaining unneeded != NULL
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 22:47:45 +02:00
a90364d001
Merge commit 'cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96'
...
* commit 'cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96':
mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-13 23:51:03 +02:00
cc3e88a2b9
mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-13 16:24:09 +00:00
d1e750cd51
avformat/mov: Support reading Avid's metadata for DNXHD codec.
...
The AALP atom is necessary to properly decode the alpha channel.
Needed for ticket #3707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 18:39:04 +02:00
d34ec64a22
replace calls to url_feof() with avio_feof()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 00:48:38 +02:00
f1e626a357
avformat/mov: read reel_name metadata from tmcd atom
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:37:55 +02:00
054c506e3d
avformat/mov: XMP metadata suppor.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:11:09 +02:00
1c84aad718
movdec: remove nonsensical snprintf.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-07-30 20:25:29 +02:00
70f7006eb3
avformat/mov: Pass through iTunSMPB from MOV.
...
Allows demuxing of iTunes files into adts while preserving gapless
metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:11:48 +02:00
73b1283012
Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'
...
* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f':
mov: free the dv demux context with avformat_free_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 23:19:06 +02:00
edb1af7c46
mov: free the dv demux context with avformat_free_context()
2014-07-09 13:38:35 +00:00
fd3388d63d
Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'
...
* 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-08 21:53:09 +02:00
18fb38fb9e
mov: Remove a variable that is set but never used
...
This silences a warning with gcc.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-08 21:14:43 +03:00
d919fdd4f7
Do not detect jp2 images as mov files.
2014-07-05 02:11:17 +02:00
fb318def5d
Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'
...
* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
mov: Support default-base-is-moof.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01 16:31:57 +02:00
20f95f21f9
mov: Support default-base-is-moof.
...
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-07-01 14:36:06 +03:00
27b893b231
avformat/mov: fix "warning: variable altitude set but not used" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 15:46:03 +02:00
a083543da0
Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'
...
* commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c':
mov: Export geotag metadata fields
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 13:24:30 +02:00
e7d6d0bf3c
mov: Export geotag metadata fields
...
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-06-06 10:46:10 +03:00
26b0d7198e
Read mov files where the moov atom is hidden within a free atom.
...
Fixes ticket #1551 / issue 2226.
2014-05-31 16:57:27 +02:00
96470ca22b
avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe
...
Fixes Ticket 3663
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 01:23:46 +02:00
e63a17bfdc
avformat/mov: use av_display_rotation_get() for rotate metadata.
2014-05-23 23:30:21 +02:00
64bf845544
avformat/mov: Dont blindly trust the stream duration in seting chapter times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-23 04:39:55 +02:00
07941c2cb2
Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'
...
* 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-19 19:21:53 +02:00
853cc025d6
mov: store display matrix in a stream side data
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-19 13:13:16 +02:00
8b96f31817
libavformat/mov: Elimitate double reading of COVR metadata if 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-15 03:43:37 +02:00
7426acff1a
Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'
...
* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
mov: export stsd Compressorname in metadata
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 17:13:05 +02:00
18f2514c40
mov: export stsd Compressorname in metadata
...
Stop using the undocumented to-be-deprecated AVCodecContext.codec_name
field.
2014-05-01 09:25:46 +02:00
4d4bc89409
avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:25:51 +02:00
6e573b7759
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
...
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
mov: read hydrogenaudio replaygain information
Conflicts:
libavformat/Makefile
libavformat/mov.c
See: 37a15f3e66
2014-04-10 21:25:15 +02:00
9a07fac678
mov: read hydrogenaudio replaygain information
2014-04-10 13:53:32 +02:00
b0a8521383
avformat/mov: reset drefs_count in close
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 14:51:36 +02:00
af2e5061bb
avformat/mov: Fix width/height typo
...
Fixes CID1197050
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 22:49:17 +02:00
61b3b3315c
Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'
...
* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509':
lavf: add supported extension to avi and mov demuxers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 03:15:19 +02:00
45ba9d8545
Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
...
* 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-02 02:54:09 +02:00
f1c4a54f6e
lavf: add supported extension to avi and mov demuxers
2014-04-02 00:27:53 +02:00
cba4e6062a
More correct printf format specifiers
...
This avoids compiler warnings about argument and specifier type mismatch.
2014-04-02 00:27:22 +02:00
1ffbaa88c9
Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'
...
* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8':
mov: fill in subtitle dimensions after parsing tkhd
See: 8ba432bc56
2014-03-31 01:58:14 +02:00
12789d9636
mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
...
This also moves mov_rewrite_dvd_sub_extradata() to mov.c.
Sample-Id: NeroRecodeSample.mp4
2014-03-31 01:08:23 +02:00
fce28c3c6d
mov: fill in subtitle dimensions after parsing tkhd
...
Sample-Id: NeroRecodeSample.mp4
2014-03-31 01:08:18 +02:00
e21235f9b9
avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions 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-17 18:36:25 +01:00
8ba432bc56
avformat/mov: fill in subtitle dimensions after parsing tkhd
...
Sample: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 18:21:11 +01:00
dadf668df2
avformat/mov: decode compilation metadata
...
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-15 04:28:58 +01:00
3ddf76ee07
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Revert "Allow stream-copying grayscale mov files."
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 12:20:06 +01:00
1f36ebf63a
avformat: revert %c changes from d92024f18f
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 05:09:28 +01:00
Carl Eugen Hoyos
Michael Niedermayer
Diego Biurrun
Reimar Döffinger
Andrew Stone
Marek Fort
James Almer
Mark Reid
Dale Curtis
Anton Khirnov
Martin Storsjö
Yusuke Nakamura
Clément Bœsch
Vittorio Giovara
Alex Sukhanov
Schenk, Michael
Marc-Antoine Arnaud
Peter Ross