summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat/flvdec: re enable flv_data_packet()Michael Niedermayer2015-03-131-2/+7
| | | | | | Found-by: kurosu Reviewed-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/flvdec: Change subtitle stream type to subtitle typeMichael Niedermayer2015-03-131-8/+8
| | | | | Previous-version-reviewed-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer <[email protected]>
* lavf: Do not list mov-only codecs in riff.c.Carl Eugen Hoyos2015-03-132-3/+7
| | | | | | Instead check for all mov code-points when demuxing avi and print a warning if a video codec is found like this. Fixes a regression similar to the one described in ticket #4307.
* Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'Michael Niedermayer2015-03-121-1/+4
|\ | | | | | | | | | | | | | | | | | | | | * commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd': matroskadec: Check memory allocations Conflicts: libavformat/matroskadec.c See: 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46 Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: Check memory allocationsVittorio Giovara2015-03-121-0/+6
| | | | | | | | CC: [email protected]
| * nutdec: Prevent leaks on memory errorVittorio Giovara2015-03-121-2/+4
| | | | | | | | Bug-Id: CID 205122 / CID 205123
* | Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'Michael Niedermayer2015-03-122-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda': lavf: Explicitly convert types at function pointer assignment Conflicts: libavformat/avio.c libavformat/aviobuf.c libavformat/swfenc.c See: a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others Merged-by: Michael Niedermayer <[email protected]>
| * lavf: Explicitly convert types at function pointer assignmentDiego Biurrun2015-03-113-3/+8
| | | | | | | | This fixes a number of "assignment from incompatible pointer type" warnings.
| * asfenc: fix leaking asf->index_ptr on errorAndreas Cadhalpun2015-03-111-0/+1
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'Michael Niedermayer2015-03-111-5/+0
|\| | | | | | | | | | | | | * commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51': rtpdec_vp9: Drop extra sanity check for size of input packet Merged-by: Michael Niedermayer <[email protected]>
| * rtpdec_vp9: Drop extra sanity check for size of input packetVittorio Giovara2015-03-111-5/+0
| | | | | | | | | | | | | | | | In this case len is always at least 1, since it is checked against RTP_VP9_DESC_REQUIRED_SIZE + 1 and then it is reduced by RTP_VP9_DESC_REQUIRED_SIZE before entering the has_pic_id check. Bug-Id: CID 1270811
* | Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'Michael Niedermayer2015-03-111-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8': mp3: Properly use AVCodecContext API Conflicts: libavformat/mp3dec.c See: 6ad42b3e15478284321dd285acaf189a16590854 See: b851bc20c6931c084710e69f7eec30d8c1bdb68e Merged-by: Michael Niedermayer <[email protected]>
| * mp3: Properly use AVCodecContext APIVittorio Giovara2015-03-111-2/+9
| | | | | | | | | | | | | | Rather than having an unitialized context on the stack, allocate it with defaults and free it when unneeded. CC: [email protected]
* | Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'Michael Niedermayer2015-03-111-1/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '9272c965d9559a90ee64d46aebd99c117e07f7a3': matroskaenc: Fix type used for chapter timestamps Conflicts: libavformat/matroskaenc.c See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626 Merged-by: Michael Niedermayer <[email protected]>
| * matroskaenc: Fix type used for chapter timestampsVittorio Giovara2015-03-111-3/+4
| |
* | lavf/libssh: support reading config from ~/.ssh/configFlorian Jacob2015-03-111-3/+8
| | | | | | | | | | | | | | | | | | | | libssh provides a function for parsing ~/.ssh/config for ssh connection parameters like user, hostname, identity file and port. This patch makes ffmpeg use this function to take parameters from the config file for everything that's not explicitely set in the url. It also supports host aliases, i.e. using a shorthand in the url and replacing it with the hostname / IP address specified for the shorthand in the config file. Signed-off-by: Florian Jacob <[email protected]> Signed-off-by: Lukasz Marek <[email protected]>
* | Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'Michael Niedermayer2015-03-102-8/+10
|\| | | | | | | | | | | | | | | | | | | * commit '448c8cfe4c53e9e806effd8505b46d57fa707061': movenc: Support setting fragment_index before the moov atom is written Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <[email protected]>
| * movenc: Support setting fragment_index before the moov atom is writtenMartin Storsjö2015-03-102-8/+10
| | | | | | | | | | | | | | | | | | | | This way, the caller doesn't need to coordinate setting the option after the moov atom has been written. The downside is that it is no longer possible to use the option for checking whether the moov atom already has been written, but a caller is able to keep track of that by other means anyway. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'Michael Niedermayer2015-03-102-4/+9
|\| | | | | | | | | | | | | * commit '0c5e380c2c266d2e8a13c000cc527529db837f10': movenc: Don't rely on the fragment index for vc1 info gathering Merged-by: Michael Niedermayer <[email protected]>
| * movenc: Don't rely on the fragment index for vc1 info gatheringMartin Storsjö2015-03-102-4/+9
| | | | | | | | | | | | | | | | The previous use of the mov->fragments field, for determining whether written packets were part of the first fragment or not, didn't work as intended when using the empty_moov flag. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'Michael Niedermayer2015-03-101-2/+1
|\| | | | | | | | | | | | | | | * commit 'cf402d6fa88acd647cdff993429583bec8a34fdc': rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded Reviewed-by: Andreas Cadhalpun <[email protected]> Merged-by: Michael Niedermayer <[email protected]>
| * rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeededMartin Storsjö2015-03-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | By making sure we at each time only have one pointer set, either a local variable or one in the context, we avoid potential double frees in the cleanup routines. If chain->rtp_ctx is set, it is closed by calling avformat_write_trailer, but that shouldn't be called unless avformat_write_header succeeded. This issue was pointed out by Andreas Cadhalpun. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'Michael Niedermayer2015-03-101-1/+1
|\| | | | | | | | | | | | | | | * commit 'c83dd2d2a458075a58895c384372f57c1ec26276': rtpenc_mpegts: Free the right ->pb in the error path in the init function Reviewed-by: Andreas Cadhalpun <[email protected]> Merged-by: Michael Niedermayer <[email protected]>
| * rtpenc_mpegts: Free the right ->pb in the error path in the init functionMartin Storsjö2015-03-101-1/+1
| | | | | | | | | | | | This fixes a typo from 8e32b1f096. Signed-off-by: Martin Storsjö <[email protected]>
* | libavformat/mxfenc: write package name metadataMark Reid2015-03-101-11/+86
| | | | | | | | | | Previous-version-reviewed-by: Tomas Härdin <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | asfenc: fix leaking asf->index_ptr on errorAndreas Cadhalpun2015-03-091-0/+1
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/siff: Fix checks and variable typesMichael Niedermayer2015-03-091-3/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'Michael Niedermayer2015-03-091-9/+10
|\| | | | | | | | | | | | | | | | | | | * commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9': siff: Use the correct type for packet size variables Conflicts: libavformat/siff.c Merged-by: Michael Niedermayer <[email protected]>
| * siff: Use the correct type for packet size variablesVittorio Giovara2015-03-091-8/+9
| | | | | | | | | | | | | | | | The avio functions used here return an unsigned value. Also reduce a variable scope. CC: [email protected] Bug-Id: CID 1258461
* | Merge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'Michael Niedermayer2015-03-091-1/+4
|\| | | | | | | | | | | | | * commit '9f25a109922da43c1f81273a431d3b40cb5a785a': matroskaenc: Also validate chapter end time Merged-by: Michael Niedermayer <[email protected]>
| * matroskaenc: Also validate chapter end timeVittorio Giovara2015-03-091-1/+4
| | | | | | | | | | | | | | This prevents it to be written as unsigned. Also add an error message. CC: [email protected] Bug-Id: CID 1265717
* | Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'Michael Niedermayer2015-03-091-8/+0
|\| | | | | | | | | | | | | * commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530': rtpdec_hevc: Drop extra sanity check for size of input packet Merged-by: Michael Niedermayer <[email protected]>
| * rtpdec_hevc: Drop extra sanity check for size of input packetVittorio Giovara2015-03-091-8/+0
| | | | | | | | | | | | | | In this case len is always at least 3, since it is checked against RTP_HEVC_PAYLOAD_HEADER_SIZE + 1 before entering the switch block. Bug-Id: CID 1238784
* | ffmdec: limit the backward seek to the last resync positionAndreas Cadhalpun2015-03-091-2/+7
| | | | | | | | | | | | | | | | | | | | If resyncing leads to the same position as previously, it will again lead to a resync attempt, resulting in an infinite loop. Thus don't seek back beyond the last syncpoint. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmdec: make sure the time base is validAndreas Cadhalpun2015-03-091-0/+11
| | | | | | | | | | | | | | A negative time base can trigger assertions. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '46d4d8575979a24a8d026d9805039b724e0e3e5f'Michael Niedermayer2015-03-091-1/+2
|\| | | | | | | | | | | | | * commit '46d4d8575979a24a8d026d9805039b724e0e3e5f': movenc: Avoid writing separate flags for the first sample if not necessary Merged-by: Michael Niedermayer <[email protected]>
| * movenc: Avoid writing separate flags for the first sample if not necessaryMartin Storsjö2015-03-091-1/+2
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'Michael Niedermayer2015-03-091-10/+15
|\| | | | | | | | | | | | | * commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba': movenc: Set tfhd default sample flags based on actual samples, if possible Merged-by: Michael Niedermayer <[email protected]>
| * movenc: Set tfhd default sample flags based on actual samples, if possibleMartin Storsjö2015-03-091-10/+15
| | | | | | | | | | | | | | | | | | | | This avoids assuming that e.g. audio samples are marked as sync samples. This allows omitting the sample flags from trun, if the default flags happen to be right for all the samples. Signed-off-by: Martin Storsjö <[email protected]>
* | ffmdec: fix infinite loop at EOFAndreas Cadhalpun2015-03-091-2/+2
| | | | | | | | | | | | | | | | If EOF is reached, while skipping bytes, avio_tell(pb) won't change anymore, resulting in an infinite loop. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmdec: initialize f_cprv, f_stvi and f_stauAndreas Cadhalpun2015-03-091-1/+1
| | | | | | | | | | | | | | | | They are used in a switch statement, but it is not guaranteed that the COMM case (where they are set to 0) is reached before the other cases. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'Michael Niedermayer2015-03-081-1/+1
|\| | | | | | | | | | | | | * commit '6448f15af02f2c3cf0df8cb8237957e426041f2d': mxfdec: Fix the error handling for when strftime fails Merged-by: Michael Niedermayer <[email protected]>
| * mxfdec: Fix the error handling for when strftime failsMartin Storsjö2015-03-081-1/+1
| | | | | | | | | | | | The str variable is a char ** here. Signed-off-by: Martin Storsjö <[email protected]>
| * rmdec: Improve message for demux errorCarl Eugen Hoyos2015-03-081-1/+1
| | | | | | | | | | | | | | Use correct context, reduce log level, don't assume it is a video stream, and print the tag of the unknown stream. Signed-off-by: Vittorio Giovara <[email protected]>
* | fix spelling errorsAndreas Cadhalpun2015-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | opttimizations -> optimizations grabing -> grabbing many resource -> many resources isnt -> isn't silcense -> silence Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'Michael Niedermayer2015-03-061-6/+6
|\| | | | | | | | | | | | | | | | | | | | | * commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e': movenc: Keep writing zero-entry stts atoms as intended Conflicts: libavformat/movenc.c See: 95165f7c1b533c121b890fa1e82e8ed596cfc108 Merged-by: Michael Niedermayer <[email protected]>
| * movenc: Keep writing zero-entry stts atoms as intendedMartin Storsjö2015-03-061-6/+6
| | | | | | | | | | | | | | | | a876585215 had the unintended side effect of returning AVERROR(ENOMEM) when track->entry is zero, while the code intentionally wants to continue in that case. Signed-off-by: Martin Storsjö <[email protected]>
| * dashenc: Update extradata for mov muxerTimo Rothenpieler2015-03-061-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | The mov muxer already supports picking up extradata that wasn't present during the avformat_write_header call - we just need to propagate it. Since the dash muxer uses delay_moov, we have time up until the first segment is written to get extradata filled in. Also update the codec description string when the extradata becomes available. Signed-off-by: Martin Storsjö <[email protected]>
| * dashenc: Simplify code by using a local variableTimo Rothenpieler2015-03-061-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * avformat/adxdec: set avctx->channels in adx_read_headerAndreas Cadhalpun2015-03-051-0/+6
| | | | | | | | | | | | | | | | | | It is used in adx_read_packet, which currently depends on the decoder/parser setting this value between reading the file header and demuxing the first packet. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 14:35:46 +0000