summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
Commit message (Collapse)AuthorAge
* 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>
* | avformat/mov: fix "correctly" typoMichael Niedermayer2013-10-16
| | | | | | | | | | Found-by: Timothy Gu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mov: Support HEVC demuxing.Yusuke Nakamura2013-10-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'Michael Niedermayer2013-10-05
|\| | | | | | | | | | | | | * commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38': mov: Don't allocate arrays with av_malloc that will be realloced Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Don't allocate arrays with av_malloc that will be reallocedMartin Storsjö2013-10-05
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mov: force parsing of headers if stts is absentMichael Niedermayer2013-10-04
| | | | | | | | | | | | Fixes Ticket2991 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix trun / pseudo_stream_id handlingMichael Niedermayer2013-10-02
| | | | | | | | | | | | This fixes simple concatenated h264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c231987662194d009dd91bfc57c678e0e70ca161'Michael Niedermayer2013-09-30
|\| | | | | | | | | | | | | | | | | | | * commit 'c231987662194d009dd91bfc57c678e0e70ca161': mov: Make sure the read sample count is nonnegative Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Make sure the read sample count is nonnegativeMartin Storsjö2013-09-29
| | | | | | | | | | | | | | | | | | This avoids setting a negative number of frames, ending up with a negative average frame rate. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | failures When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mov: reset extradata size when extradata gets deallocated due to ↵Michael Niedermayer2013-09-22
| | | | | | | | | | | | | | | | realloc failure This prevents the fields from becoming inconsistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-18
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'Michael Niedermayer2013-09-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52': mov: Don't use a negative duration for setting other fields Conflicts: libavformat/mov.c See: 87d073eaccc00ef2909445ae4b25128c440d9efa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Don't use a negative duration for setting other fieldsMartin Storsjö2013-09-17
| | | | | | | | | | | | | | | | | | | | Some files have the duration set to -1 in the mdhd atom, more or less legitimately. (We produce such files ourselves, for the initial duration in fragmented mp4 files.) Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'Michael Niedermayer2013-09-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f369b9356c4606cd4d713d60f7db5de119d901fa': avformat: Use av_reallocp_array() where suitable Conflicts: libavformat/asfenc.c libavformat/gxfenc.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp_array() where suitableAlexandra Khirnova2013-09-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f': mov: Parse tmcd extradata Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Parse tmcd extradataLuca Barbato2013-08-25
| |
* | Merge commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d': mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsdLuca Barbato2013-08-24
| |
* | Merge commit '08504380ddf25d6905e189e9bf52e7a4c771a415'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit '08504380ddf25d6905e189e9bf52e7a4c771a415': mov: Refactor codec specific final steps in mov_finalize_stsd_codec Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Refactor codec specific final steps in mov_finalize_stsd_codecLuca Barbato2013-08-24
| |
* | Merge commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | * commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e': mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitleLuca Barbato2013-08-24
| |
* | Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4': mov: Refactor audio specific parsing in mov_parse_stsd_audio Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Refactor audio specific parsing in mov_parse_stsd_audioLuca Barbato2013-08-24
| |
* | Merge commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e': mov: Refactor video specific parsing in mov_parse_stsd_video Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Refactor video specific parsing in mov_parse_stsd_videoLuca Barbato2013-08-24
| |
* | Merge commit 'bf9856250584228678963ce8f11c54f85005d783'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit 'bf9856250584228678963ce8f11c54f85005d783': mov: Refactor codec id selection in mov_codec_id Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Refactor codec id selection in mov_codec_idLuca Barbato2013-08-24
| |
* | Merge commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7'Michael Niedermayer2013-08-23
|\| | | | | | | | | | | | | * commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7': mov: use tkhd enabled flag to set the default track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: use tkhd enabled flag to set the default trackJohn Stebbins2013-08-23
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix frame width and height for some targa_y216 samples.Carl Eugen Hoyos2013-08-18
| | | | | | | | Fixes ticket #2864.