summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
| * mkv: Add support for DVB subtitlesLuca Barbato2015-03-15
| | | | | | | | Bug-Id: 833
* | avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()zhaoxiu.zeng2015-03-16
| | | | | | | | | | Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: refactor repeated HLS option updatesMicah Galizia2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Disallow ".." in dref unless use_absolute_path is setMichael Niedermayer2015-03-16
| | | | | | | | | | | | | | | | as this kind of allows to circumvent it to some extend. We also could add a separate parameter or value to choose this Found-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec: fix MXFPackage->comment_refs memory leakMark Reid2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: store cookies returned in HLS key responseMicah Galizia2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | | | | | | | | | * commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710': udp: Use AVOptions Conflicts: libavformat/udp.c See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Use AVOptionsLuca Barbato2015-03-15
| | | | | | | | Add AVOptions for options currently available as url parameters.
* | Merge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24'Michael Niedermayer2015-03-15
|\| | | | | | | | | | | | | * commit 'a4c5801070198c1f2af32fa5cf850c330615ac24': sctp: Update to match tcp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sctp: Update to match tcpLuca Barbato2015-03-15
| | | | | | | | Use AVOption and fallback over multiple addresses
* | libavformat/mxfenc: write user comment metadataMark Reid2015-03-15
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe()Michael Niedermayer2015-03-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe()Michael Niedermayer2015-03-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()zhaoxiu.zeng2015-03-15
| | | | | | | | | | Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: cleanup includezhaoxiu.zeng2015-03-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: use avpriv_find_start_code in avi_read_packet()zhaoxiu.zeng2015-03-15
| | | | | | | | | | Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec: export user comments metadataMark Reid2015-03-14
| | | | | | | | | | Previous-revision-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Check for string truncation in mov_open_dref()Michael Niedermayer2015-03-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Use sizeof(filename) instead of a literal numberMichael Niedermayer2015-03-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '247e370e2a913db52ca079b347a174c8d393b171'Michael Niedermayer2015-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '247e370e2a913db52ca079b347a174c8d393b171': TDSC decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * TDSC decoderVittorio Giovara2015-03-13
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/http: support auto reconnectZhang Rui2015-03-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: add support for OnCaptionMichael Niedermayer2015-03-13
| |
* | avformat/flvdec: re enable flv_data_packet()Michael Niedermayer2015-03-13
| | | | | | | | | | | | Found-by: kurosu Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Change subtitle stream type to subtitle typeMichael Niedermayer2015-03-13
| | | | | | | | | | Previous-version-reviewed-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Do not list mov-only codecs in riff.c.Carl Eugen Hoyos2015-03-13
| | | | | | | | | | | | 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-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd': matroskadec: Check memory allocations Conflicts: libavformat/matroskadec.c See: 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: Check memory allocationsVittorio Giovara2015-03-12
| | | | | | | | CC: libav-stable@libav.org
| * nutdec: Prevent leaks on memory errorVittorio Giovara2015-03-12
| | | | | | | | Bug-Id: CID 205122 / CID 205123
* | Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'Michael Niedermayer2015-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * lavf: Explicitly convert types at function pointer assignmentDiego Biurrun2015-03-11
| | | | | | | | This fixes a number of "assignment from incompatible pointer type" warnings.
| * asfenc: fix leaking asf->index_ptr on errorAndreas Cadhalpun2015-03-11
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'Michael Niedermayer2015-03-11
|\| | | | | | | | | | | | | * commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51': rtpdec_vp9: Drop extra sanity check for size of input packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_vp9: Drop extra sanity check for size of input packetVittorio Giovara2015-03-11
| | | | | | | | | | | | | | | | 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-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8': mp3: Properly use AVCodecContext API Conflicts: libavformat/mp3dec.c See: 6ad42b3e15478284321dd285acaf189a16590854 See: b851bc20c6931c084710e69f7eec30d8c1bdb68e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3: Properly use AVCodecContext APIVittorio Giovara2015-03-11
| | | | | | | | | | | | | | Rather than having an unitialized context on the stack, allocate it with defaults and free it when unneeded. CC: libav-stable@libav.org
* | Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'Michael Niedermayer2015-03-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '9272c965d9559a90ee64d46aebd99c117e07f7a3': matroskaenc: Fix type used for chapter timestamps Conflicts: libavformat/matroskaenc.c See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Fix type used for chapter timestampsVittorio Giovara2015-03-11
| |
* | lavf/libssh: support reading config from ~/.ssh/configFlorian Jacob2015-03-11
| | | | | | | | | | | | | | | | | | | | 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 <projects+ffmpeg@florianjacob.de> Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | | | | | | | * commit '448c8cfe4c53e9e806effd8505b46d57fa707061': movenc: Support setting fragment_index before the moov atom is written Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Support setting fragment_index before the moov atom is writtenMartin Storsjö2015-03-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ö <martin@martin.st>
* | Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | * commit '0c5e380c2c266d2e8a13c000cc527529db837f10': movenc: Don't rely on the fragment index for vc1 info gathering Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Don't rely on the fragment index for vc1 info gatheringMartin Storsjö2015-03-10
| | | | | | | | | | | | | | | | 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ö <martin@martin.st>
* | Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | | | * commit 'cf402d6fa88acd647cdff993429583bec8a34fdc': rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeededMartin Storsjö2015-03-10
| | | | | | | | | | | | | | | | | | | | | | | | 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ö <martin@martin.st>
* | Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | | | * commit 'c83dd2d2a458075a58895c384372f57c1ec26276': rtpenc_mpegts: Free the right ->pb in the error path in the init function Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_mpegts: Free the right ->pb in the error path in the init functionMartin Storsjö2015-03-10
| | | | | | | | | | | | This fixes a typo from 8e32b1f096. Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat/mxfenc: write package name metadataMark Reid2015-03-10
| | | | | | | | | | Previous-version-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: fix leaking asf->index_ptr on errorAndreas Cadhalpun2015-03-09
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/siff: Fix checks and variable typesMichael Niedermayer2015-03-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>