summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix compilation with --disable-everything --enable-demuxer=matroska.Carl Eugen Hoyos2014-05-311-1/+1
| | | | | | | | Fixes ticket #3693.
* | Use rc_max_rate in av_find_best_stream() if bitrate == 0.Carl Eugen Hoyos2014-05-311-0/+2
| | | | | | | | Fixes ticket #2042.
* | libavformat: output cues for each subtitle block in MKV muxerJohn Peebles2014-05-311-25/+32
| | | | | | | | | | Signed-off-by: John Peebles <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() ↵Michael Niedermayer2014-05-311-3/+0
| | | | | | | | | | | | | | | | from abb810db036628e11a5171134ebe320b187ee6d6" This has become unneeded due to f797b134cad4d248b1c8955659997980d0668bc3 This reverts commit 1fe40e1b0538a8eb8425123c47775b5d141ae084.
* | Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'Michael Niedermayer2014-05-313-3/+2
|\| | | | | | | | | | | | | | | * commit 'f797b134cad4d248b1c8955659997980d0668bc3': rtpenc_chain: Don't copy the time base to the source stream by default See: 1fe40e1b0538a8eb8425123c47775b5d141ae084 Merged-by: Michael Niedermayer <[email protected]>
| * rtpenc_chain: Don't copy the time base to the source stream by defaultMartin Storsjö2014-05-313-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only copy it manually in the muxers where it makes sense (rtspenc, sapenc). Don't touch the original AVStream in movenchint, where the original AVStream should be kept untouched. This fixes the normal tracks in RTP hinted files after abb810db - the hint tracks were ok while the normal media tracks were broken, noticed by Michael Niedermayer. This reverts abb810db but achieves the same effect for the other muxers. Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/flvenc: fix assertion failure after 4h muxingMichael Niedermayer2014-05-311-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from ↵Michael Niedermayer2014-05-301-0/+3
| | | | | | | | | | | | abb810db036628e11a5171134ebe320b187ee6d6 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'abb810db036628e11a5171134ebe320b187ee6d6'Michael Niedermayer2014-05-301-0/+3
|\| | | | | | | | | | | | | * commit 'abb810db036628e11a5171134ebe320b187ee6d6': Revert "rtpenc_chain: Don't copy the time_base back to the caller" Merged-by: Michael Niedermayer <[email protected]>
| * Revert "rtpenc_chain: Don't copy the time_base back to the caller"Martin Storsjö2014-05-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | While it strictly isn't necessary to copy the time base (since any use of it is scaled in ff_write_chained), it still is better to signal the actual time base to the caller, avoiding one unnecessary rescaling. This also lets the caller know what the actual internal time base is, in case that is useful info for some caller. This reverts commit 397ffde115f4e0482a007b672f40457596cebfc4. Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/nutenc: Suggest genpts if AV_NOPTS_VALUEMichael Niedermayer2014-05-301-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/matroskadec: fix off by 1 error in matroska_read_seek()Michael Niedermayer2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | Fixes out of array read Fixes: vp9-opus-crash.webm Found-by: Dale Curtis <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Improve frame size calculation in caf muxer to fix adpcm_ms remuxing.Carl Eugen Hoyos2014-05-301-5/+5
| | | | | | | | Fixes ticket #3645.
* | Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'Michael Niedermayer2014-05-291-3/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit '962d63157322466a9a82f9f9d84c1b6f1b582f65': matroskaenc: set the stream timebase earlier Conflicts: tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <[email protected]>
| * matroskaenc: set the stream timebase earlierAnton Khirnov2014-05-291-3/+3
| | | | | | | | Fixes calculating the ts offset for audio codecs with delay.
* | Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'Michael Niedermayer2014-05-291-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * flvenc: only write the framerate tag based on avg_frame_rateAnton Khirnov2014-05-291-4/+4
| | | | | | | | | | Do not fall back on the codec timebase, since that can be anything for VFR video.
* | Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'Michael Niedermayer2014-05-291-1/+7
|\| | | | | | | | | | | | | * commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9': movenc: write avg_frame_rate as the framerate, not the codec timebase Merged-by: Michael Niedermayer <[email protected]>
| * movenc: write avg_frame_rate as the framerate, not the codec timebaseAnton Khirnov2014-05-291-1/+7
| |
* | Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'Michael Niedermayer2014-05-291-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * matroskaenc: base DefaultDuration on the framerate, not the codec timebaseAnton Khirnov2014-05-291-1/+2
| | | | | | | | | | | | 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-291-1/+2
| | | | | | | | | | | | Its implied by sp_count==0 Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutenc: limit index table size if no index is going to be writtenMichael Niedermayer2014-05-291-1/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutenc: add mode that omits the indexMichael Niedermayer2014-05-292-1/+5
| | | | | | | | | | | | | | When the index is not written, several data tables become unneeded, reducing memory and cpu requirements. Signed-off-by: Michael Niedermayer <[email protected]>
* | nutenc: avoid av_tree_find() operation per syncpointMichael Niedermayer2014-05-291-7/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutdec: Fix handling of older 4.0 filesMichael Niedermayer2014-05-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutenc: bump minor version due to broadcast/pipeMichael Niedermayer2014-05-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutenc: change check to match commentMichael Niedermayer2014-05-291-1/+1
| | | | | | | | | | | | The code appears to assume STABLE will never change Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutenc: fix used version valueMichael Niedermayer2014-05-291-1/+1
| | | | | | | | | | | | | | 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 <[email protected]>
* | Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'Michael Niedermayer2014-05-293-9/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * nut: Support experimental NUT 4 featuresLuca Barbato2014-05-283-9/+74
| | | | | | | | | | | | | | 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 <[email protected]>
* | Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'Michael Niedermayer2014-05-293-1/+12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6d212599aa684f30511fb08ca30fe2378405304e': avformat: Provide a standard compliance flag Conflicts: doc/APIchanges libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <[email protected]>
| * avformat: Provide a standard compliance flagLuca Barbato2014-05-283-1/+11
| | | | | | | | | | | | Provide f_strict for avconv usage. Signed-off-by: Luca Barbato <[email protected]>
| * oggenc: Fix the EOS flagMichael Niedermayer2014-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* | lavf: Remove experimental flag for Opus in WebMVignesh Venkatasubramanian2014-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | libavformat/utils: Warning about invalid cover art instead of an errorLazaros Koromilas2014-05-281-2/+6
| | | | | | | | | | | | This way other streams can still be used with the -map option. Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/matroskaenc: fix ident stringMichael Niedermayer2014-05-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'Michael Niedermayer2014-05-282-2/+47
|\| | | | | | | | | | | | | | | | | | | * commit '106b62f4ba600f24415eaded5e020aeceb23fd59': matroskaenc: write the channel mask for FLAC Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <[email protected]>
| * matroskaenc: write the channel mask for FLACAnton Khirnov2014-05-282-2/+47
| |
* | Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'Michael Niedermayer2014-05-284-16/+10
|\| | | | | | | | | | | | | | | | | | | * commit 'efcde917af407a6031ecff68edd51fce7b83d104': vorbiscomment: simplify API by using av_dict_count() Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <[email protected]>
| * vorbiscomment: simplify API by using av_dict_count()Anton Khirnov2014-05-284-16/+10
| |
* | Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'Michael Niedermayer2014-05-2812-13/+54
|\| | | | | | | | | | | | | | | | | | | * commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: parse the channel layout mask for FLACAnton Khirnov2014-05-2811-12/+53
| | | | | | | | It is commonly stored in a vorbiscomment block in codec private data.
* | Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'Michael Niedermayer2014-05-281-1/+24
|\| | | | | | | | | | | | | | | | | | | * commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0': matroskadec: export just the STREAMINFO block as FLAC extradata Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: export just the STREAMINFO block as FLAC extradataAnton Khirnov2014-05-281-1/+24
| | | | | | | | | | 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-281-68/+80
|\| | | | | | | | | | | | | | | | | | | * commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c': matroskadec: split parsing tracks into a separate function Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: split parsing tracks into a separate functionAnton Khirnov2014-05-281-58/+69
| |
* | Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'Michael Niedermayer2014-05-281-1/+1
|\| | | | | | | | | | | | | * commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0': flac: make avpriv_flac_parse_block_header() inline Merged-by: Michael Niedermayer <[email protected]>
| * flac: make avpriv_flac_parse_block_header() inlineAnton Khirnov2014-05-281-1/+1
| | | | | | | | | | | | 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-283-0/+36
|\| | | | | | | | | | | | | | | | | | | * commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c': flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 10:06:39 +0000