summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* | Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | * commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05': rtpenc: Add a rtpflag option for sending BYE packets when finishing Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Add a rtpflag option for sending BYE packets when finishingMartin Storsjö2013-11-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b264453de93999ea6f23e98014390af468f56146'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'b264453de93999ea6f23e98014390af468f56146': rtpenc: Remove some superfluous parentheses Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Remove some superfluous parenthesesMartin Storsjö2013-11-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4': aviobuf: Handle a NULL buffer in avio_close_dyn_buf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aviobuf: Handle a NULL buffer in avio_close_dyn_bufMartin Storsjö2013-11-01
| | | | | | | | | | | | | | | | | | | | | | | | This simplifies proper error handling in rtsp.c/rtspdec.c. When broadcasting over RTSP in TCP mode, the AVIOContext is closed and recreated for each sent packet, and if the recreation fails, we might try to close a NULL buffer when freeing things at the end. Previously, if recreating the buffer in rtspdec.c failed, this would crash later due to trying to close a NULL buffer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b6a4701612514c97d22f7ffb37993539f7718352': mpegts: Support HEVC demuxing Conflicts: Changelog libavformat/version.h See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Support HEVC demuxingMickaël Raulet2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075': matroskadec: Support HEVC demuxing Conflicts: Changelog libavformat/matroskadec.c libavformat/version.h See: 16b6839de6767924c4640d6e9204b6eeb5c53910 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: Support HEVC demuxingYusuke Nakamura2013-10-31
| |
* | Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7': mov: Support HEVC demuxing Conflicts: Changelog libavformat/mov.c libavformat/version.h See: 53f903b7c5427cb18659f7775714e860c1c5fc39 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Support HEVC demuxingYusuke Nakamura2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5846646296e377e093441dfe9eadde38ff1f7c99': Add raw HEVC demuxer Conflicts: Changelog libavformat/hevcdec.c libavformat/version.h See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add raw HEVC demuxerDirk Farin2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'ce6949d3a0607eb318dc2872553110df934e9720': oggparsetheora: stop using deprecated avcodec_set_dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9af7a8523a6bb517834ebed36093bdab11a8b38e': HNM4/HNM4A demuxer & video decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * HNM4/HNM4A demuxer & video decoderDavid Kment2013-10-31
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/thp: force moving forwardMichael Niedermayer2013-10-31
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket3098 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/thp: fix variable types to avoid overflowsMichael Niedermayer2013-10-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: fix cookiesMichael Niedermayer2013-10-31
| | | | | | | | | | | | Fixes Ticket3096 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | * qatar/master: lavf: Remove a now useless parameter to ffurl_register_protocol Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Remove a now useless parameter to ffurl_register_protocolMartin Storsjö2013-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added in 9b07a2dc02e9 as an ABI hack to allow older code built with lavf 52 to register protocols even if the size of the URLProtocol struct was increased. Later, registering protocols from outside of lavf was removed and this workaround isn't needed any longer since lavf 53. This removes an unchecked malloc and a memory leak for the cases when this workaround actually was used - which it hasn't since lavf 53. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | * qatar/master: oggparsetheora: check av_mallocz result Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: check av_mallocz resultAnton Khirnov2013-10-30
| |
* | Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | | | | | | | * commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d': oggparsetheora: return meaningful error codes Conflicts: libavformat/oggparsetheora.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: return meaningful error codesAnton Khirnov2013-10-30
| |
* | Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | | | | | | | * commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68': oggparsetheora: K&R cosmetics, reformat Conflicts: libavformat/oggparsetheora.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: K&R cosmetics, reformatAnton Khirnov2013-10-30
| | | | | | | | | | | | | | | | Also typedef the private data struct and make its name consistent with the rest of Libav. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavf/spdifdec: fix demuxing of AAC in IEC 61937Anssi Hannula2013-10-29
| | | | | | | | | | | | | | | | Return value of avpriv_aac_parse_header() is not checked correctly. Fix it. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | * commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04': lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a dummy field to AVStream to preserve ABI compatibility for avconvAnton Khirnov2013-10-29
| | | | | | | | | | | | | | | | avconv abuses the API by accessing AVStream.parser (which is private). Removing AVStream.reference_dts in 2ba68dd044ca8fc591139c05563840f546a9c0c0 breaks ABI compatibility for an old avconv using a newer lavf. Fix this by adding a dummy field until the next bump.
| * avio: Check for memory allocation failure of private dataDerek Buitenhuis2013-10-29
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | lavf: remove unreliable timestamp guessing heuristicAnton Khirnov2013-10-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: re-add trailing \n.Clément Bœsch2013-10-29
| | | | | | | | | | | | Regression since ac9529ce. Spotted by Timothy Gu.
* | matroskaenc: fixed display width / height calculation for stereo modeMichael Niedermayer2013-10-29
| | | | | | | | | | Based-on: patch by Asan Usipov <asan.usipov@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | * commit 'feeafb4adabd5c17de1738ed9962e40892b20edb': lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from ↵Anton Khirnov2013-10-28
| | | | | | | | shared objects
| * lavf: remove unreliable timestamp guessing heuristicAnton Khirnov2013-10-28
| |
* | avformat/gxf: fix old codec idMichael Niedermayer2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Factor out a couple of returnsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Simplify a stray av_log messageStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM)Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Use AV_* prefixes for video and audio IDsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove outdated undef blockStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove a couple of useless AviSynthContext castsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Don't declare structs anonymouslyStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: CosmeticsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Change most of the comments to /* */ from //Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>