summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
Commit message (Collapse)AuthorAge
* avformat/mov: Try to detect and support files with invalid sample sizesMichael Niedermayer2013-05-30
| | | | | | Fixes Ticket2605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: Rename alt_sample_size so its name matches what it isMichael Niedermayer2013-05-25
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: set block_align for MACE 3:1 and MACE 6:1Piotr Bandurski2013-05-18
| | | | | | fixes remuxing of audio track from mov to aifc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-16
| |
* | Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriateDiego Biurrun2013-05-04
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Move misplaced file author information where it belongsDiego Biurrun2013-04-11
| |
* | libspeex: support ZygoAudio (quality 10 mode)Piotr Bandurski2013-03-23
| | | | | | | | | | | | Fixes "quality 10" mode from Ticket1873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'Michael Niedermayer2013-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e': avformat: av_log_ask_for_sample() ---> avpriv_request_sample() Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-13
| |
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-11
| |
* | Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'Michael Niedermayer2013-02-24
|\| | | | | | | | | | | | | | | * 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>
| * mov: use the format context for logging.Anton Khirnov2013-02-23
| | | | | | | | CC:libav-stable@libav.org
* | mov: fix self referencing timecode tracksMichael Niedermayer2013-02-20
| | | | | | | | | | | | | | Fixes read after free. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: remove unused functionMichael Niedermayer2013-02-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mov: skip version and flags attributes in mov_read_chan functionMatthieu Bouron2013-02-06
| | | | | | | | | | | | Fixes ticket #1764. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: prevent double free if the caller replaces the io context.Michael Niedermayer2013-01-22
| | | | | | | | | | | | Fixes Ticket2148 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support more AVC-Intra filesReimar Döffinger2013-01-03
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | lavf/mov: fix timecode track reference usage.Clément Bœsch2013-01-01
| |
* | lavf/mov: simplify timecode track ref.Clément Bœsch2013-01-01
| | | | | | | | | | There can be only one track reference. The multiple tref handling is handled at a different level.
* | mov: fix parsing of the chap atom.Hendrik Leppkes2013-01-01
| | | | | | | | | | | | | | This was broken in 0d96ec19ebc1577b27a889136364a906e1c627b1 under the assumption that there is only one tref leaf atom. Fixes Ticket #2081.
* | mov: fix handling of odd sized yv12Carl Eugen Hoyos2013-01-01
| | | | | | | | | | | | Part 1 of 2 to fix Ticket339 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mov: handle h263 and flv1 for codec_tag 'H','2','6','3'Janne Grunau2012-12-19
| | | | | | | | | | | | | | | | | | | | 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 5442083b1c541dd166b3adf39131259fc846a62b by Carl Eugen Hoyos. Fixes bug 393.
* | mov: parse @PRM and @PRQ metadata tagsPeter Ross2012-12-10
| | | | | | | | | | These tags describe the product and quicktime library version respectively. Originate from Adobe Premier, but some other products use them.
* | Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'Michael Niedermayer2012-12-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mov: validate number of DataReferenceBox entries against box sizeJanne Grunau2012-12-07
| | | | | | | | | | Avoids a 2G memory allocation and parsing of random data in mov_read_dref(). The fuzzed sample sample.mp4_s224424 triggers this.
| * mov: compute avg_frame_rate only if duration is knownJanne Grunau2012-12-07
| | | | | | | | Fixes an assert in fuzzed sample sample.mp4_s265930.
* | Support Sorenson Spark in f4v files streamed by Flash Media Server.Carl Eugen Hoyos2012-12-01
| |
* | Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'Michael Niedermayer2012-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: add a common function for selecting a pcm codec from parametersJustin Ruggles2012-11-28
| |
* | mov: set flags to indicate that byte wise seeking is not supported.Michael Niedermayer2012-11-25
| | | | | | | | | | | | Fixes Ticket1831 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix possible NULL-pointer dereference when decoding mov files.Carl Eugen Hoyos2012-11-18
| | | | | | | | Fixes CID743440, introduced in 850e5c0.
* | mov: add more udta meta data recognitionXidorn Quan2012-11-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Read QuickTime version 1 audio fields in broken mov files.Carl Eugen Hoyos2012-11-15
| | | | | | | | | | | | | | | | Matrox XMIO capture boards write files with major brand "JUNK" and compatible brand "qt " that contain QuickTime version 1 audio fields. Fixes ticket #1881.
* | mov: Dont try to calculate with unknown durations, fix division by 0Michael Niedermayer2012-11-14
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: check stps correctly, avoid overreading 1 element.Michael Niedermayer2012-11-13
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-11
| | | | | | | | Also reorder some other #include when applicable.
* | mov: Make sure no streams after the header lack a timescale.Michael Niedermayer2012-11-10
| | | | | | | | | | | | | | Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov_probe: use correct variableMichael Niedermayer2012-10-25
| | | | | | | | | | Fixes CID739867 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not detect mov with maximum score if the atom size is too small.Carl Eugen Hoyos2012-10-23
| | | | | | | | Fixes mpegts-in-mov, ticket #987 / issue 2223.
* | Improve MPEG-PS-in-MOV detection.Carl Eugen Hoyos2012-10-21
| | | | | | | | Fixes issue 1520.
* | bavformat/mov: add {} to complex ifsMichael Niedermayer2012-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force ↵Petter Ericson2012-10-19
| | | | | | | | | | | | | | continued probing if found. Fixes Ticket241 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov_probe: fix integer overflowsMichael Niedermayer2012-10-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix time types related to mov_metadata_creation_timeMichael Niedermayer2012-10-17
| | | | | | | | | | | | Fixes Ticket1817 Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: print warning if ff_get_wav_header() failsMichael Niedermayer2012-10-16
| | | | | | | | | | Fixes CID717497 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 00:20:30 +0000