summaryrefslogtreecommitdiff
path: root/libavformat/isom.c
Commit message (Collapse)AuthorAge
* Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr().Carl Eugen Hoyos2014-05-21
| | | | Fixes ticket #3660.
* Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'Michael Niedermayer2014-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '121b5b7e0476d22408d748b914799b7c00acc3a4': isom: add some BOXX tags isom: add 'flic' tag isom: add 'm1v ' tag Conflicts: libavformat/isom.c See: ca8623e1a537fa48366efebdf235442f1197bb71 See: 8a3f976498cc096644b95ade7240a73e17d3a042 See: fca62f05005567514b5daaea230ba9365e202201 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: add some BOXX tagsPiotr Bandurski2014-04-04
| |
| * isom: add 'flic' tagReimar Döffinger2014-04-04
| |
| * isom: add 'm1v ' tagCarl Eugen Hoyos2014-04-04
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * OpenEXR decoderJimmy Christensen2014-04-01
| | | | | | | | | | | | | | Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno, Nicolas George, Paul B Mahol and Michael Niedermayer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhdMichael Niedermayer2014-03-31
| | | | | | | | | | | | This also moves mov_rewrite_dvd_sub_extradata() to mov.c. Sample-Id: NeroRecodeSample.mp4
| * isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()Michael Niedermayer2014-03-31
| | | | | | | | Sample-Id: NeroRecodeSample.mp4
| * isom: Simplify mov_rewrite_dvd_sub_extradata()Michael Niedermayer2014-03-31
| | | | | | | | This avoids the 2nd buffer and fixes the palette truncated check
| * isom: fix C99-style declarationMichael Niedermayer2014-03-16
| |
* | avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions ↵Michael Niedermayer2014-03-17
| | | | | | | | | | | | | | | | | | from tkhd This also moves mov_rewrite_dvd_sub_extradata() to mov.c Fixes: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: only write the size if its non zero in ↵Michael Niedermayer2014-03-17
| | | | | | | | | | | | | | | | mov_rewrite_dvd_sub_extradata() Fixes regression with NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: Simplify mov_rewrite_dvd_sub_extradata()Michael Niedermayer2014-03-17
| | | | | | | | | | | | This avoids the 2nd buffer and fixes the palette truncated check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: fix mix of declaration and statementMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8f629a986c46f227abda1811a6ad1f449871ca35'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * commit '8f629a986c46f227abda1811a6ad1f449871ca35': isom: convert mp4 dvdsub extradata to vobsub format Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: convert mp4 dvdsub extradata to vobsub formatwm42014-03-15
| | | | | | | | | | | | | | | | | | | | | | | | mp4 files embedding DVD subtitles do not use the same extradata format as the rest of Libav expects. The subtitle decoder in libavcodec in particular does not understand this format. Convert the extradata to the vobsub .idx format. mp4 stores the palette as binary 32 bit ints in YUV. The subtitle resolution is stored separately in the track header, which we access through AVStream. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit '4f3db5d3418a24f3b90422e98ad75388052c4284': movenc: allow muxing HEVC in MODE_MP4. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: allow muxing HEVC in MODE_MP4.Tim Walker2014-03-09
| |
* | Merge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit '1d9014f0b008485eac4c19d5f5e11ede59237167': movenc: use 'hev1' tag for HEVC in MODE_MOV. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: use 'hev1' tag for HEVC in MODE_MOV.Tim Walker2014-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'hvc1' requires that parameter set NAL units be present only in the samples entry, but not in the samples themselves, requiring that additional parameter sets, if present, be filtered out of the samples and placed in new, additional sample entries if they override or otherwise conflict with the parameter sets present in the first sample entry. We do not have any way of doing this at present, so the files we produce can only comply with the restrictions set for the 'hev1' sample entry name in ISO/IEC 14496-15.
| * movdec: handle 0x7fff langcode as macintosh per the specsBaptiste Coudurier2014-03-09
| | | | | | | | | | | | The correct point that seperates ISO and MAC language codes is 0x400 according to the current QT spec. Old QT specs did not list where this seperation is but apparently only defined the meaning of the first 137.
* | Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | | | | | * commit '8a0bc40545a216a49f43db5d9a42a63961333354': libspeex: support ZygoAudio (quality 10 mode) Conflicts: libavformat/isom.c See: e26b066cd8db361feba90e943c6cfdf062c52272 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libspeex: support ZygoAudio (quality 10 mode)Piotr Bandurski2014-03-09
| |
| * isom: lpcm in mov default to big endianMark Himsley2014-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is my understanding that "Unless otherwise stated, all data in a QuickTime movie is stored in big-endian byte ordering" [1] in MOV files. I have a couple of thousand files, which technically are invalid because their sound sample description element 4CC is 'lpcm' but its version is 0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or twos-complement ('twos') format" [2] Because isom.c only contains a mapping for 4CC 'lpcm' to AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when it is actually BE. This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'. [1] https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf page 21 [2] https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf page 178 Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
| * isom: add "MNG" FourCCPiotr Bandurski2014-03-09
| |
| * isom: Support MPEG-2 video mov files from FPC5Carl Eugen Hoyos2014-03-09
| |
| * isom: add "NO16" FourCCPiotr Bandurski2014-03-09
| |
| * isom: add Radius DV YUV FourCCsPiotr Bandurski2014-03-09
| |
* | avformat/isom: remove duplicated lineMichael Niedermayer2014-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | * commit 'eeae858596a5ce5a84797283f590a16add5704f4': isom: Support Sony XAVC in mov See: 5b9f39860d83380c4af3039710b4fcf3ea1f4c99 See: 6e65e3483706d969d176909fae9e216919f59277 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: Support Sony XAVC in movCarl Eugen Hoyos2014-03-09
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * isom: add xd51 hdcamBen Littler2014-03-09
| | | | | | | | Someone needs to binary search FCP for new isom...
| * 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>
* | Support MPEG-2 video mov files with sample description mp2v.Carl Eugen Hoyos2014-02-23
| |
* | lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()wm42014-01-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: use ff_get_extradata()Michael Niedermayer2013-12-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: free extradata on failure to read itMichael Niedermayer2013-12-25
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f607d80f661_6965_mov00003.mqv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: check avio_read() resultMichael Niedermayer2013-12-22
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f7aa4151661_4885_dmbts3.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: zero MPEG4AudioConfig to avoid leaving fields uninitializedMichael Niedermayer2013-12-18
| | | | | | | | | | | | | | Fixes: use of uninitialized memory Fixes: msan_uninit-mem_7f392c443e0d_1433_Crowd_Applause_01.caf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: lpcm in mov default to big endianMark Himsley2013-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is my understanding that "Unless otherwise stated, all data in a QuickTime movie is stored in big-endian byte ordering" [1] in MOV files. I have a couple of thousand files, which technically are invalid because their sound sample description element 4CC is 'lpcm' but its version is 0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or twos-complement ('twos') format" [2] Because isom.c only contains a mapping for 4CC 'lpcm' to AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when it is actually BE. This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'. [1] https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf page 21 [2] https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf page 178 Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/riff: Fix a comment.Carl Eugen Hoyos2013-10-18
| | | | | | | | | | FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra. Spotted by Kieran Kunhya and Vincent Olivier.
* | Support 4k AVC-Intra in mov.Carl Eugen Hoyos2013-10-18
| |
* | 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>
* | isom: add xd51 hdcam , someone needs to binary search FCP for new isom...Compn2013-06-19
| |
* | Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9': Apple Intermediate Codec decoder movenc: Don't add base_data_offset in tfhd for PIFF files Conflicts: Changelog libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Apple Intermediate Codec decoderKostya Shishkov2013-05-17
| |
* | 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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 00:15:38 +0000