31931520df
mov: Do not allow updating the time scale after it has been set
...
The time scale is set in mdhd, and later validated in the
enclosing trak atom once all of its children have been parsed.
A loose mdhd atom outside of a trak atom could update the time
scale of the last stream without any validation.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-07-15 21:38:58 +03:00
5b4eb243bc
mov: Seek back if overreading an individual atom
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-07-15 21:37:44 +03:00
38ce775eea
libavformat/mov.c: Skipped duplicated MOOV atom
...
This should fix ticket 1378
If we have parsed a moov atom, and found another one, just skip it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-12 02:41:34 +02:00
9a1ec1f2f2
Force correct extradata for AVID AVCI50 in mov.
...
Fixes ticket #2106 .
Reviewed-by: Kieran Kunhya
2013-07-09 11:43:33 +02:00
70b922f371
avformat/mov: read stream bitrates from isml manifest
...
This allows to read a live isml movie and segment it using the
smoothstreaming muxer, which requires the bitrates to be known for each stream.
Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-08 17:36:45 +02:00
dc2a13aa80
avformat/mov: Fix duration of fragmented mov
...
Fixes Ticket2757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-07 04:11:14 +02:00
0915b531bc
Rename "AVClass class" as "AVClass component_class".
...
The aix header math.h defines "extern int class()" for C.
2013-06-30 13:47:45 +02:00
f91833210e
Set block_align when reading QDM2 in mov.
...
Fixes ticket #2718 .
2013-06-28 09:04:16 +02:00
b1d61eb7aa
avformat/mov: ignore samples overflowing next_root_atom
...
This fixes #2657 .
ISML movies produced by Microsoft Expression Encoder 4 seem to have invalid
sample entries in their trun/tfhd for data tracks. As a result, too much bytes
are read for these tracks to the point that next_root_atom can go out of
buffer, which makes the encoding fail if the input is not seekable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-12 00:51:38 +02:00
8912029031
avformat/mov: compute dts_shift with trun cts
...
Some movies have negative composition time offsets in their trun, causing pts <
dts errors. This patch makes use of dts_shift to handle them.
Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com >
2013-06-07 16:30:27 +02:00
29e97cd6c3
avformat/mov: Try to detect and support files with invalid sample sizes
...
Fixes Ticket2605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 00:32:36 +02:00
5292dac34c
avformat/mov: Rename alt_sample_size so its name matches what it is
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-25 18:47:36 +02:00
7baef22fca
mov: set block_align for MACE 3:1 and MACE 6:1
...
fixes remuxing of audio track from mov to aifc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-18 16:26:50 +02:00
efc08e00cc
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
...
* 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 >
2013-05-16 09:56:43 +02:00
2832ea26f3
Remove commented-out debug #define cruft
2013-05-16 00:23:30 +02:00
f083b4c338
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
...
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-05 12:31:03 +02:00
e0f8be6413
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
2013-05-04 21:43:06 +02:00
580a0600ef
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Move misplaced file author information where it belongs
Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-11 15:56:18 +02:00
ac9362c5d9
Move misplaced file author information where it belongs
2013-04-11 02:42:11 +02:00
e26b066cd8
libspeex: support ZygoAudio (quality 10 mode)
...
Fixes "quality 10" mode from Ticket1873
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-23 15:45:58 +01:00
a9ddb62489
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
...
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-14 12:41:34 +01:00
1ecdf8912b
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
2013-03-13 20:42:21 +01:00
85a5bc054c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
2013-03-11 18:23:50 +01:00
663ebae79a
Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'
...
* commit '56daf10e0313c5e36f43e773f457d2a99ff0df10':
mov: use the format context for logging.
flicvideo: avoid an infinite loop in byte run compression
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-24 13:15:59 +01:00
56daf10e03
mov: use the format context for logging.
...
CC:libav-stable@libav.org
2013-02-23 13:05:16 +01:00
2ccaab9709
mov: fix self referencing timecode tracks
...
Fixes read after free.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-20 15:46:33 +01:00
199683c898
mov: remove unused function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-07 11:54:46 +01:00
59d40fc7e6
lavf/mov: skip version and flags attributes in mov_read_chan function
...
Fixes ticket #1764 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-06 22:39:40 +01:00
0a84174f2d
mov: prevent double free if the caller replaces the io context.
...
Fixes Ticket2148
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-22 05:15:47 +01:00
c5142a95a5
Support more AVC-Intra files
...
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 >
2013-01-03 21:48:38 +01:00
c14f8a52b0
lavf/mov: fix timecode track reference usage.
2013-01-01 16:20:10 +01:00
8d398f40b4
lavf/mov: simplify timecode track ref.
...
There can be only one track reference. The multiple tref handling is
handled at a different level.
2013-01-01 16:20:10 +01:00
765158dd82
mov: fix parsing of the chap atom.
...
This was broken in 0d96ec19eb#2081 .
2013-01-01 15:16:37 +01:00
67abe21c0b
mov: fix handling of odd sized yv12
...
Part 1 of 2 to fix Ticket339
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-01 00:44:44 +01:00
40ea343866
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
...
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
cmdutils: pass number of groups to split_commandline().
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-20 12:06:15 +01:00
bb2bab92e7
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
...
The sample in https://bugzilla.libav.org/show_bug.cgi?id=393 and
samples/F4V/H263_NM_f.mp4 both have codec_tag H263 for different
codecs. H263 is apparently used by Flash Media Server for Sorensen
Spark videos.
Patch based on commit 5442083b1c
2012-12-19 14:50:14 +01:00
f540851ce3
mov: parse @PRM and @PRQ metadata tags
...
These tags describe the product and quicktime library version respectively.
Originate from Adobe Premier, but some other products use them.
2012-12-10 21:12:59 +11:00
7c425e4f2d
Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'
...
* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
h264: check sps.log2_max_frame_num for validity
mov: validate number of DataReferenceBox entries against box size
mov: compute avg_frame_rate only if duration is known
flac: change minimum and default of lpc_passes option to 1
Conflicts:
libavcodec/h264_ps.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-07 15:52:43 +01:00
8cc2fa1e5d
mov: validate number of DataReferenceBox entries against box size
...
Avoids a 2G memory allocation and parsing of random data in
mov_read_dref(). The fuzzed sample sample.mp4_s224424 triggers this.
2012-12-07 11:43:28 +01:00
80b6b31417
mov: compute avg_frame_rate only if duration is known
...
Fixes an assert in fuzzed sample sample.mp4_s265930.
2012-12-07 11:43:28 +01:00
5442083b1c
Support Sorenson Spark in f4v files streamed by Flash Media Server.
2012-12-01 21:16:11 +01:00
d7b20bfbb5
Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'
...
* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
lavf: move nuv fourcc audio tags from riff to nuv
lavf: add a common function for selecting a pcm codec from parameters
Conflicts:
libavformat/internal.h
libavformat/mov.c
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-29 14:00:44 +01:00
261e9348ef
lavf: add a common function for selecting a pcm codec from parameters
2012-11-28 11:18:50 -05:00
e6305f7631
mov: set flags to indicate that byte wise seeking is not supported.
...
Fixes Ticket1831
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-25 01:19:33 +01:00
ab82b77822
Fix possible NULL-pointer dereference when decoding mov files.
...
Fixes CID743440, introduced in 850e5c0
2012-11-18 08:52:50 +01:00
8ee6db393c
mov: add more udta meta data recognition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-16 14:12:37 +01:00
850e5c041d
Read QuickTime version 1 audio fields in broken mov files.
...
Matrox XMIO capture boards write files with major brand "JUNK"
and compatible brand "qt " that contain QuickTime version 1
audio fields.
Fixes ticket #1881 .
2012-11-15 14:38:19 +01:00
87d073eacc
mov: Dont try to calculate with unknown durations, fix division by 0
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-14 14:08:44 +01:00
4392e69ad4
mov: check stps correctly, avoid overreading 1 element.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-13 21:45:53 +01:00
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-12 11:32:11 +01:00
Martin Storsjö