summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
Commit message (Collapse)AuthorAge
* 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.
* | Merge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf'Michael Niedermayer2013-07-16
|\| | | | | | | | | | | | | * commit '31931520df35a6f9606fe8293c8a39e2d1fabedf': mov: Do not allow updating the time scale after it has been set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Do not allow updating the time scale after it has been setMartin Storsjö2013-07-15
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'Michael Niedermayer2013-07-16
|\| | | | | | | | | | | | | | | | | | | * commit '5b4eb243bce10a3e8345401a353749e0414c54ca': mov: Seek back if overreading an individual atom Conflicts: libavformat/mov.c See: 6093960ae35c8d69c559b5604f683c2ea3f279ca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Seek back if overreading an individual atomMartin Storsjö2013-07-15
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat/mov.c: Skipped duplicated MOOV atomThierry Foucu2013-07-12
| | | | | | | | | | | | | | 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>
* | Force correct extradata for AVID AVCI50 in mov.Carl Eugen Hoyos2013-07-09
| | | | | | | | | | | | Fixes ticket #2106. Reviewed-by: Kieran Kunhya
* | avformat/mov: read stream bitrates from isml manifestAlexandre Sicard2013-07-08
| | | | | | | | | | | | | | | | 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>
* | avformat/mov: Fix duration of fragmented movMichael Niedermayer2013-07-07
| | | | | | | | | | | | Fixes Ticket2757 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rename "AVClass class" as "AVClass component_class".Carl Eugen Hoyos2013-06-30
| | | | | | | | The aix header math.h defines "extern int class()" for C.
* | Set block_align when reading QDM2 in mov.Carl Eugen Hoyos2013-06-28
| | | | | | | | Fixes ticket #2718.
* | avformat/mov: ignore samples overflowing next_root_atomAlexandre Sicard2013-06-12
| | | | | | | | | | | | | | | | | | | | 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>
* | avformat/mov: compute dts_shift with trun ctsAlexandre Sicard2013-06-07
| | | | | | | | | | | | | | 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>
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 07:33:22 +0000