summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Replace an incorrect av_free() in movenc.c with av_freep().Carl Eugen Hoyos2014-03-10
|
* Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'Michael Niedermayer2014-03-10
|\ | | | | | | | | | | | | | | | | | | | | * commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf': mxfdec: Validate parameters to strftime Conflicts: libavformat/mxfdec.c See: 423089e964410adbf13af3de42e3c9dd5a1babd6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: Validate parameters to strftimeMartin Storsjö2014-03-10
| | | | | | | | | | | | | | | | | | | | | | | | The MSVCRT version of strftime calls the invalid parameter handler if the struct values in struct tm are invalid. In case no invalid parameter handler is set for the process, the process is aborted. This fixes fate failures on MSVC builds since 570af382. Based on a patch by Hendrik Leppkes. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * qatar/master: matroskaenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker2014-03-09
| |
* | Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit 'a823d0948683bd97dd58556b5740e434166209a8': matroskaenc: write private data in hvcC format for HEVC. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write private data in hvcC format for HEVC.Tim Walker2014-03-09
| |
* | avformat/hevc: fix mix of av_malloc() with free()Michael Niedermayer2014-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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
| |
* | avformat/hevc: Make return codes consistent and more flexibleMichael Niedermayer2014-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926': movenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker2014-03-09
| |
* | avformat: fix hevcs use of golomb from avformatMichael Niedermayer2014-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | | | * commit '20b40a597cdd4969cf1147d7c7efee2b6232524b': movenc: write hvcC tag for HEVC. Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: write hvcC tag for HEVC.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.
| * riff: add VP9 fourccJames Zern2014-03-09
| |
| * riff: IPJ2 decodes with JPEG2000 decoderBen Littler2014-03-09
| | | | | | | | Samples can be made from mencoder and jp2avi.dll codec.
| * 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...
* | Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c': movenc: allow override of "writing application" tag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: allow override of "writing application" tagJohn Stebbins2014-03-08
| | | | | | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org
* | Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | | | * commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d': matroskaenc: allow override of "writing application" tag Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: allow override of "writing application" tagJohn Stebbins2014-03-08
| | | | | | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org
* | lavf/concatdec: reindent after last commit.Nicolas George2014-03-08
| |
* | lavf/concatdec: more reliable test for absolute URLs.Nicolas George2014-03-08
| | | | | | | | | | | | | | ff_make_absolute_url() recognizes the "://" pattern usual in HTTP-like protocols, but consider relative URLs starting with just the protocol name or using the comma syntax for options.
* | lavf: add subfile protocol.Nicolas George2014-03-08
| |
* | Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'Michael Niedermayer2014-03-08
|\| | | | | | | | | | | | | | | | | | | * commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a': matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: cosmetics: Fix "attachement" vs. "attachment" typoDiego Biurrun2014-03-07
| |
* | Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | | | | | | | * commit '84cfce9f99805a144df684417e166c1ae6f95421': matroskadec: K&R formatting cosmetics Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: K&R formatting cosmeticsKeiji Costantini2014-03-07
| | | | | | | | | | | | Also sort #includes into canonical order. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * qatar/master: rtmppkt: Rename the ts_delta field to ts_field Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Rename the ts_delta field to ts_fieldMartin Storsjö2014-03-07
| | | | | | | | | | | | | | | | | | | | | | Based on a suggestion by Martin Panter. This is more descriptive, since it's the actual timestamp field from the RTMP packet, which might or might not be a delta depending on context (in some packets it's a delta, in some packets it's an absolute timestamp, and in some packets it's 0xffffff to indicate that the actual delta or absolute timestamp is transmitted separately). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3': rtmppkt: Properly handle extended timestamps when writing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Properly handle extended timestamps when writingMartin Panter2014-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * commit '48cfb5f4114048383a4ee85b2f500eefce24cad2': rtmppkt: Add a descriptive comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Add a descriptive commentMartin Panter2014-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * commit '5b2ad78f97d43299adcb038c04346999fe9b196c': rtmppkt: Handle extended timestamp field even for one-byte header Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 12:49:39 +0000