summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'Michael Niedermayer2014-05-29
|\ | | | | | | | | | | | | | | | | | | | | * commit '962d63157322466a9a82f9f9d84c1b6f1b582f65': matroskaenc: set the stream timebase earlier Conflicts: tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: set the stream timebase earlierAnton Khirnov2014-05-29
| | | | | | | | Fixes calculating the ts offset for audio codecs with delay.
* | Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43e7f0797f9f821a3866a20f05e512e13c82076a': flvenc: only write the framerate tag based on avg_frame_rate Conflicts: tests/ref/lavf/flv_fmt tests/ref/seek/lavf-flv_fmt tests/ref/seek/vsynth2-flv tests/ref/vsynth/vsynth1-flashsv tests/ref/vsynth/vsynth1-flv tests/ref/vsynth/vsynth2-flashsv tests/ref/vsynth/vsynth2-flv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: only write the framerate tag based on avg_frame_rateAnton Khirnov2014-05-29
| | | | | | | | | | Do not fall back on the codec timebase, since that can be anything for VFR video.
* | Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | * commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9': movenc: write avg_frame_rate as the framerate, not the codec timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: write avg_frame_rate as the framerate, not the codec timebaseAnton Khirnov2014-05-29
| |
* | Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '81eec081afea9fc017a175581ceea7c420a0dfc3': matroskaenc: base DefaultDuration on the framerate, not the codec timebase Conflicts: libavformat/matroskaenc.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv See: ea83b032af825d10f7d6db8a71933edce5b842a3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: base DefaultDuration on the framerate, not the codec timebaseAnton Khirnov2014-05-29
| | | | | | | | | | | | This results in DefaultDuration not being written when the framerate is not known, but as this field is purely informative, this should not break any sane demuxers.
* | avformat/nutenc: replace conditional by assertMichael Niedermayer2014-05-29
| | | | | | | | | | | | Its implied by sp_count==0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: limit index table size if no index is going to be writtenMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: add mode that omits the indexMichael Niedermayer2014-05-29
| | | | | | | | | | | | | | When the index is not written, several data tables become unneeded, reducing memory and cpu requirements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutenc: avoid av_tree_find() operation per syncpointMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutdec: Fix handling of older 4.0 filesMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: bump minor version due to broadcast/pipeMichael Niedermayer2014-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: change check to match commentMichael Niedermayer2014-05-29
| | | | | | | | | | | | The code appears to assume STABLE will never change Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: fix used version valueMichael Niedermayer2014-05-29
| | | | | | | | | | | | | | The broadcast/pipe flags arent stable + 1 they would be 4 or whenever but wouldnt change based on which is stable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c94e2e85cb6af8a570d8542a830556243bd32873': nut: Support experimental NUT 4 features Conflicts: doc/nut.texi libavformat/nut.h libavformat/nutdec.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Support experimental NUT 4 featuresLuca Barbato2014-05-28
| | | | | | | | | | | | | | Add the low overhead pipe mode and the extended broadcast mode. Export the options as 'syncponts' since it impacts only that. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6d212599aa684f30511fb08ca30fe2378405304e': avformat: Provide a standard compliance flag Conflicts: doc/APIchanges libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Provide a standard compliance flagLuca Barbato2014-05-28
| | | | | | | | | | | | Provide f_strict for avconv usage. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * oggenc: Fix the EOS flagMichael Niedermayer2014-05-28
| | | | | | | | | | | | | | | | | | | | | | This corrects the bug that caused the checksums to change in 9767d7c092c890ecc5953452e8a951fd902dd67b. It caused the EOS flag to be set incorrectly; the ogg spec does not allow it to be set in the middle of a logical bitstream. Signed-off-by: Andrew Kelley <superjoe30@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: Remove experimental flag for Opus in WebMVignesh Venkatasubramanian2014-05-28
| | | | | | | | | | | | | | | | | | | | Opus in WebM is no more experimental as we have everything necessary in the container writing code as per the spec. So removing the experimental flag. Note that we removed the experimental suffix from the CodecId field long ago ( http://goo.gl/O0TYRB ). Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/utils: Warning about invalid cover art instead of an errorLazaros Koromilas2014-05-28
| | | | | | | | | | | | This way other streams can still be used with the -map option. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: fix ident stringMichael Niedermayer2014-05-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '106b62f4ba600f24415eaded5e020aeceb23fd59': matroskaenc: write the channel mask for FLAC Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write the channel mask for FLACAnton Khirnov2014-05-28
| |
* | Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit 'efcde917af407a6031ecff68edd51fce7b83d104': vorbiscomment: simplify API by using av_dict_count() Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbiscomment: simplify API by using av_dict_count()Anton Khirnov2014-05-28
| |
* | Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: parse the channel layout mask for FLACAnton Khirnov2014-05-28
| | | | | | | | It is commonly stored in a vorbiscomment block in codec private data.
* | Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0': matroskadec: export just the STREAMINFO block as FLAC extradata Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: export just the STREAMINFO block as FLAC extradataAnton Khirnov2014-05-28
| | | | | | | | | | It contains all information that is used by the decoder and the other FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.
* | Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c': matroskadec: split parsing tracks into a separate function Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: split parsing tracks into a separate functionAnton Khirnov2014-05-28
| |
* | Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | * commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0': flac: make avpriv_flac_parse_block_header() inline Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: make avpriv_flac_parse_block_header() inlineAnton Khirnov2014-05-28
| | | | | | | | | | | | This avoids all the ABI troubles associated with avpriv_. Since this function is very small and does not depend on any tables, making it inline should have no adverse effects.
* | Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c': flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel filesAnton Khirnov2014-05-28
| |
* | Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | * commit 'd6b9ce99ea384fb676561461768b8316725a4ccd': flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tagAnton Khirnov2014-05-28
| | | | | | | | It is used to store the channel mask for non-standard layouts.
* | libavformat/utils: Fix segfault on m4a cover artwork parsingLazaros Koromilas2014-05-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggenc: fix EOS flagMichael Niedermayer2014-05-28
| | | | | | | | | | | | | | This corrects the bug that caused the checksums to change in 9767d7c092c890ecc5953452e8a951fd902dd67b Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '9767d7c092c890ecc5953452e8a951fd902dd67b': oggenc: Flush after writing headers Conflicts: tests/ref/lavf/ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggenc: Flush after writing headersAndrew Kelley2014-05-27
| | | | | | | | | | | | | | | | | | | | | | | | | | Before, header information for ogg format files was sent with the first encoded packet. This patch makes it so that it is possible for API users to differentiate between headers and encoded audio. This is useful, for example, when creating an audio stream where you want to send one set of headers for every client that connects and then the encoded stream of audio. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | * commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1': oggenc: Move ogg_write_pages up above ogg_write_header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggenc: Move ogg_write_pages up above ogg_write_headerAndrew Kelley2014-05-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/rtspdec: Use av_mallocz_array()Michael Niedermayer2014-05-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: set max analyze duration depending on the circumstancesMichael Niedermayer2014-05-26
| | | | | | | | | | | | Fixes Ticket3673 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: move default for max_analyze_duration into utils.cMichael Niedermayer2014-05-26
| | | | | | | | | | | | this way we can do better tha a single fixed constant value Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Write the actual mp3 frame size when muxing into caf if available.Carl Eugen Hoyos2014-05-26
| | | | | | | | Fixes ticket #3648.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 11:52:49 +0000