summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* hls: add missing checks for accessing avoption fieldsMichael Niedermayer2013-01-23
| | | | | | Fixes null pointer exception and probably other things Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/hls: broker HTTP optionsMicah Galizia2013-01-23
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavf/segment: exit immediately in case of invalid stream specifierStefano Sabatini2013-01-23
| | | | | Avoid duplicated confusing error message, and propagate error code from the failing avformat_match_stream_specifier() call.
* lavf/segment: avoid failure in case -flags +live and -segment_times/frames ↵Stefano Sabatini2013-01-23
| | | | | | | are specified The conflict does not apply any longer, since the M3U8 segment target duration is re-computed every time a new segment is added to the list.
* lavf/segment: drop now pointless segment_list_close() functionStefano Sabatini2013-01-23
|
* lavf/segment: mark #EXT-X-ENDLIST in M3U8 only at the end of streamStefano Sabatini2013-01-23
| | | | | | Should fix immediate playback termination. In particular, should fix trac ticket #2172.
* rtmp: fix buffer overflows in ff_amf_tag_contents()Xi Wang2013-01-23
| | | | | | | | | | | | A negative `size' will bypass FFMIN(). In the subsequent memcpy() call, `size' will be considered as a large positive value, leading to a buffer overflow. Change the type of `size' to unsigned int to avoid buffer overflow, and simplify overflow checks accordingly. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rtmp: fix multiple broken overflow checksXi Wang2013-01-23
| | | | | | | | | | | | Sanity checks like `data + size >= data_end || data + size < data' are broken, because `data + size < data' assumes pointer overflow, which is undefined behavior in C. Many compilers such as gcc/clang optimize such checks away. Use `size < 0 || size >= data_end - data' instead. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rtpenc: fix overflow checking in avc_mp4_find_startcode()Xi Wang2013-01-23
| | | | | | | | | | | | The check `start + res < start' is broken since pointer overflow is undefined behavior in C. Many compilers such as gcc/clang optimize away this check. Use `res > end - start' instead. Also change `res' to unsigned int to avoid signed left-shift overflow. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mvdec: check channel count.Michael Niedermayer2013-01-22
| | | | | | | Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mvdec: minor simplification, remove av_inv_q()Michael Niedermayer2013-01-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mvdec: use avpriv_set_pts_info() instead of directly setting tb.Michael Niedermayer2013-01-22
| | | | | | | Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix compilation with --disable-everything --enable-demuxer=loasCarl Eugen Hoyos2013-01-22
|
* lavf/aiffenc: ID3 tags supportMatthieu Bouron2013-01-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in ↵Stefano Sabatini2013-01-22
| | | | docs
* rtpenc: do not use random values for seq when bitexact is requested.Michael Niedermayer2013-01-22
| | | | | | Fixes fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'Michael Niedermayer2013-01-22
|\ | | | | | | | | | | | | | | | | | | | | * commit '4f56e773fe8a554b8c2662650aaf799c2ece2721': x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly rtpenc: Start the sequence numbers from a random offset Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Start the sequence numbers from a random offsetMartin Storsjö2013-01-22
| | | | | | | | | | | | | | | | Expose the current sequence number via an AVOption - this can be used both for setting the initial sequence number, or for querying the current number. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'Michael Niedermayer2013-01-22
|\| | | | | | | | | | | | | | | | | | | * commit '570a4a0189946c2c983da41d37fdd67fa13266e7': avidec: use sensible error codes instead of -1 Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: use sensible error codes instead of -1Jindrich Makovicka2013-01-21
| | | | | | | | | | | | | | | | Use AVERROR_INVALIDDATA on invalid inputs, and AVERROR_EOF when no more frames are available in an interleaved AVI. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | mov: prevent double free if the caller replaces the io context.Michael Niedermayer2013-01-22
| | | | | | | | | | | | Fixes Ticket2148 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: support seeking in infinitely looped streamMichael Niedermayer2013-01-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/hlsenc: append last incomplete segment when closing the outputStefano Sabatini2013-01-21
| | | | | | | | Also introduce missing check on PTS value in case of NOPTS value.
* | oggdec: remove unused variablesMichael Niedermayer2013-01-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a4f26206d7914eaf2903954ce97cb7686933382': dsputil: remove butterflies_float_interleave. srtp: Move a variable to a local scope srtp: Add tests for the crypto suite with 32/80 bit HMAC Conflicts: libavcodec/x86/dsputil.asm libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Move a variable to a local scopeMartin Storsjö2013-01-21
| | | | | | | | | | | | This simplifies the code slightly. Signed-off-by: Martin Storsjö <martin@martin.st>
| * srtp: Add tests for the crypto suite with 32/80 bit HMACMartin Storsjö2013-01-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | * commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f': srtp: cosmetics: Use fewer lines for the test vectors srtp: Don't require more input data than what actually is needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: cosmetics: Use fewer lines for the test vectorsMartin Storsjö2013-01-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * srtp: Don't require more input data than what actually is neededMartin Storsjö2013-01-21
| | | | | | | | | | | | | | | | | | | | The theoretical minimum for a (not totally well formed) RTCP packet is 8 bytes, so we shouldn't require 12 bytes as minimum input. Also return AVERROR_INVALIDDATA instead of 0 if something that is not a proper packet is given. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610': srtp: Improve the minimum encryption buffer size check srtp: Add support for a few DTLS-SRTP related crypto suites Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Improve the minimum encryption buffer size checkMartin Storsjö2013-01-21
| | | | | | | | | | | | | | This clarifies where the limit number comes from, and only requires exactly as much padding space as will be needed. Signed-off-by: Martin Storsjö <martin@martin.st>
| * srtp: Add support for a few DTLS-SRTP related crypto suitesMartin Storsjö2013-01-21
| | | | | | | | | | | | | | | | The main difference to the existing suites from RFC 4568 is that the version with a 32 bit HMAC still uses 80 bit HMAC for RTCP packets. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84': rtpdec/srtp: Handle CSRC fields being present rtpdec: Check the return value from av_new_packet ac3dec: fix non-optimal dithering of zero bit mantissas Conflicts: libavcodec/ac3dec.c libavformat/rtpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec/srtp: Handle CSRC fields being presentMartin Storsjö2013-01-21
| | | | | | | | | | | | This is untested in practice, but follows the spec. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Check the return value from av_new_packetMartin Storsjö2013-01-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c': rtpdec: Move setting the parsing flags to the actual depacketizers rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer Conflicts: libavformat/rtpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Move setting the parsing flags to the actual depacketizersMartin Storsjö2013-01-20
| | | | | | | | | | | | | | This gets rid of almost all the codec specific details from the generic rtpdec code. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Split handling of mpeg12 audio/video to a separate depacketizerMartin Storsjö2013-01-20
| | | | | | | | | | | | This also adds checking of mallocs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | * commit '2326558d5277ec87ba6d607a01ec6acfc51c694c': rtpdec: Split mpegts parsing to a normal depacketizer rtpdec: Reorder payload handler registration alphabetically Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Split mpegts parsing to a normal depacketizerMartin Storsjö2013-01-20
| | | | | | | | | | | | | | This gets rid of a number of special cases from the common rtpdec code. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Reorder payload handler registration alphabeticallyMartin Storsjö2013-01-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a717f9904227d7979473bad40c50eb40af41d01d'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | * commit 'a717f9904227d7979473bad40c50eb40af41d01d': mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions rtpdec_mpeg4: Return one AAC AU per AVPacket ppc: Include string.h for memset Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Share the cleanup code between the demuxer and lavf-internal parser ↵Martin Storsjö2013-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | functions The lavf-internal parser functions are used when receiving mpegts over RTP. This fixes memory leaks in this setup. The normal mpegts demuxer close function was updated in ec7d0d2e in 2004 to fix leaks, but the parsing function used for RTP wasn't updated and has been leaking ever since. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec_mpeg4: Return one AAC AU per AVPacketMartin Storsjö2013-01-20
| | | | | | | | | | | | | | This makes the returned data valid to stream copy into other containers as well, not only for decoding straight away. Signed-off-by: Martin Storsjö <martin@martin.st>
* | oggdec: #if 0 disabled codeMichael Niedermayer2013-01-21
| | | | | | | | | | Fixes CID968589 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix memory leak on string reassignMicah Galizia2013-01-21
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Fixes CID968584 and CID968585
* | cafdec: fix overflow checking in read_header()Xi Wang2013-01-20
| | | | | | | | | | | | | | | | | | | | Several compilers such as clang/icc/pathscale will optimize the check pos + size < pos (assuming size > 0) into false, since signed integer overflow is undefined behavior in C. This breaks overflow checking. Use a safe precondition check instead. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wtvdec: fix integer overflowMichael Niedermayer2013-01-20
| | | | | | | | | | Fixes CID968583 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: Support chained streams, support replacing streams in multistream files.Michael Niedermayer2013-01-20
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: Changelog