summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '1d4579e38ecad578c86516fad2837a273d11b320'Michael Niedermayer2014-10-11
|\ | | | | | | | | | | | | | | | | | | | | * commit '1d4579e38ecad578c86516fad2837a273d11b320': tcp: Add AVOption support Conflicts: libavformat/tcp.c See: 2e009c6042bde419599ebed9165e597bbef23b2f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tcp: Add AVOption supportLuca Barbato2014-10-10
| |
* | avformat/assenc: make sure we crawl extradata only if it's non-nullClément Bœsch2014-10-10
| |
* | Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | * commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119': tls: Support passing old-style tcp options See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Support passing old-style tcp optionsLuca Barbato2014-10-10
| | | | | | | | Make tcp and tls urls near-interchangeable.
* | Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | * commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f': rtsp: Add rtsps to the probe Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Add rtsps to the probeLuca Barbato2014-10-10
| |
* | Merge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | * commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb': rtsp: Support tls when in listen mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support tls when in listen modeLuca Barbato2014-10-10
| |
* | Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | * commit '8b2e9636c57b22582143467a8a06b509b47b92f9': rtsp: Support tls-encapsulated RTSP Conflicts: libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support tls-encapsulated RTSPLuca Barbato2014-10-10
| |
* | Merge commit 'c27328e749ff3be648411765cd17362fee017341'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c27328e749ff3be648411765cd17362fee017341': rtsp: Check for command strings without spaces Conflicts: libavformat/rtspdec.c See: a0568ed2544025de3c66dd500811f5ba43f38af4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Check for command strings without spacesLuca Barbato2014-10-10
| | | | | | | | | | | | Prevent a NULL-pointer dereference. CC: libav-stable@libav.org
* | Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d': sctp: Use AVERROR_BUG instead of abort() Conflicts: libavformat/sctp.c See: 2e59142fa9a0db5fab8aa2e676ba524f61280b83 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sctp: Use AVERROR_BUG instead of abort()Luca Barbato2014-10-10
| | | | | | | | | | | | | | | | Trying to write to a stream id larger the the maximum requested is a programming error, still there is no reason to leave a reachable abort() in the codebase. CC: libav-stable@libav.org
* | Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'eb4f9069002e73648f6640cd054fc814cfda75b8': lavf: More informative error message Conflicts: libavformat/mux.c See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: More informative error messageLuca Barbato2014-10-10
| | | | | | | | Print the timestamp values and not just the stream index.
* | avformat/movenc: add EAC3 muxing support.Benoit Fouet2014-10-10
| | | | | | | | | | | | | | | | | | Support only one independent substream right now, and only syncframes containing 6 blocks. Fixes part of ticket #3074 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: move mime_type_opt declaration to where its usedMichael Niedermayer2014-10-10
| | | | | | | | | | | | also remove a related dead store Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/os_support: include unistd.h before defining lseek to lseek64 on ↵Michael Niedermayer2014-10-10
| | | | | | | | | | | | | | | | | | android fixes build failure Found-by: James Almer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/webm_dash: Allow filenames without directoriesVignesh Venkatasubramanian2014-10-10
| | | | | | | | | | | | | | | | Fix basename computation code to allow just file names without any directories in the path. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix writing first audio Cues in dash mode.Frank Galligan2014-10-09
| | | | | | | | | | | | | | | | | | In dahsmode Matroska is not writing the first Cluster for every audio stream in the Cues element. Signed-off-by: Frank Galligan <frankgalligan@gmail.com> Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: E-AC-3 streams need parsing too.Benoit Fouet2014-10-09
| | | | | | | | | | | | | | syncframes in E-AC-3 can be combined to provide 6 audio blocks per sample, thus requiring parsing for proper decoding. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: fix 2GB file seek limit on AndroidYu Xiaolei2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Fix 'warning: format specifies type unsigned short but the ↵Michael Niedermayer2014-10-09
| | | | | | | | | | | | argument has type int' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dump: use format dump_separator if the codec one is not setMichael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix seperator typoMichael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6': mov: support the Color Parameter Atoms 'colr' Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: support the Color Parameter Atoms 'colr'Vittorio Giovara2014-10-08
| |
* | Merge commit '167e6f1489368a4693145da61cb022c113a285bc'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | | | * commit '167e6f1489368a4693145da61cb022c113a285bc': dump: Update streams and chapters printout format See: cab2860c8a49756daccde3111eb27271209495cd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: Update streams and chapters printout formatSylvain Rabot2014-10-08
| | | | | | | | This matches the -map option which requires '%d:%d' format.
* | avformat: Allow choosing the dump format field separator.Michael Niedermayer2014-10-09
| | | | | | | | | | | | The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | | | | | | | | | * commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8': dump: split audio and video probing on multiple lines Conflicts: libavcodec/utils.c libavformat/dump.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: split audio and video probing on multiple linesVittorio Giovara2014-10-08
| | | | | | | | Also always report pixel format.
* | Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'Michael Niedermayer2014-10-08
|\| | | | | | | | | | | | | | | | | | | * commit '7ae9791b641d1183910b6e7faca23f7ae08f8579': avformat: bump version after mime_type change Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: bump version after mime_type changeVittorio Giovara2014-10-08
| |
* | Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'Michael Niedermayer2014-10-08
|\| | | | | | | | | | | | | | | | | | | * commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7': avformat: use const char* instead of uint8_t* for AVProbeData.mime_type Conflicts: libavformat/format.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: use const char* instead of uint8_t* for AVProbeData.mime_typeAndreas Cadhalpun2014-10-08
| | | | | | | | | | | | | | This makes the field consistent with AVInputFormat.mime_type and the argument type of av_match_name. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/matroskadec: do not trust the default duration to be the real ↵Michael Niedermayer2014-10-08
| | | | | | | | | | | | | | | | 1/timebase if its less than 5fps Fixes Ticket3980 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/tiertexseq: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: read reel_name and source timecode from physical source packageMark Reid2014-10-07
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'Michael Niedermayer2014-10-07
|\| | | | | | | | | | | | | | | | | | | * commit '28816050e47b6dba430a52e429d21a864cffda8e': lavf: Set the stream time base hint properly for chained muxers Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Set the stream time base hint properly for chained muxersMartin Storsjö2014-10-06
| | | | | | | | | | | | | | This avoids warnings about using the codec time base as time base hint. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'Michael Niedermayer2014-10-07
|\| | | | | | | | | | | | | * commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7': sdp: Simplify parsing/conversion of H264 extradata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Simplify parsing/conversion of H264 extradataMartin Storsjö2014-10-06
| | | | | | | | | | | | | | | | | | | | | | | | By using ff_avc_write_annexb_extradata instead of the h264_mp4toannexb BSF, the code for doing the conversion itself is kept much shorter, there's less state to restore at the end, we don't risk leaving the AVCodecContext in an inconsistent state if returning early due to errors, etc. Also add a missing free if the base64 encoding fails. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mov: do not overwrite extradata in mov_read_glbl()Michael Niedermayer2014-10-06
| | | | | | | | | | | | | | | | | | | | Fixes regression from Ticket3962 This basically favors the first global header while since 34751f8313a41bf94e004ffa9491f35d96763558 it was the last. If this heuristic turns out worse, do not hesitate to revert this and reopen 3962 as a feature request for multiple STSD Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: remove obsolete FF_API_READ_PACKET cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_SET_PTS_INFO cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 13:53:31 +0000