summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* lavf/avio: check for : in filenames for protocols.Nicolas George2013-02-281-1/+3
| | | | | | | | | If the first "special" character in a filename is a comma, it can introduce protocol options, but only if there is a colon at the end. Otherwise, it is just a filename with a comma. Fix trac ticket #2303.
* lavf: rescale duration for chained muxers.Nicolas George2013-02-281-0/+4
| | | | | | | Fix trac ticket #2300 because the duration of the segments was computed using the timestamp of the last packet plus its duration using the 1/90000 default time base instead of using the chained muxer time base.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-287-10/+110
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: Add a fate test for the noproxy pattern matching lavf: Handle the environment variable no_proxy more properly Conflicts: libavformat/Makefile libavformat/internal.h libavformat/tls.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add a fate test for the noproxy pattern matchingMartin Storsjö2013-02-272-1/+45
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Handle the environment variable no_proxy more properlyMartin Storsjö2013-02-275-9/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of the environment variable no_proxy, present since one of the initial commits (de6d9b6404), is inconsistent with how many other applications and libraries interpret this variable. Its bare presence does not indicate that the use of proxies should be skipped, but it is some sort of pattern for hosts that does not need using a proxy (e.g. for a local network). As investigated by Rudolf Polzer, different libraries handle this in different ways, some supporting IP address masks, some supporting arbitrary globbing using *, some just checking that the pattern matches the end of the hostname without regard for whether it actually is the right domain or a domain that ends in the same string. This simple logic should be pretty similar to the logic used by lynx and curl. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "lavf/utils: add support for special characters encoding in URL"Michael Niedermayer2013-02-281-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4a8fc1d83b1b55e1ac533644168018ebeec0c732. The commit caused null pointer derefernces when using udp:// after i fixed that it caused ffmpeg to get stuck and remapped arguments like ?ttl=255 -> ?ttl%3d255 I dont want to leave this broken thus temporary revert so we all have some time to look at this without half the network protocols being broken in the meantime
* | lavf/utils: add support for special characters encoding in URLSenthilnathan M2013-02-281-0/+47
| | | | | | | | | | | | | | In particular, fix trac ticket #2031. Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavf/concatdec: define "ffcat" and "ffconcat" extensionsStefano Sabatini2013-02-282-1/+2
| |
* | oggdec: chained oggs have timestamp discontinuitiesMichael Niedermayer2013-02-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: make i unsigned, avoid undefined behavior of i++Michael Niedermayer2013-02-251-1/+1
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: fix integer overflowMichael Niedermayer2013-02-251-1/+1
| | | | | | | | | | | | | | Its unlikely this affects any valid files. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hls: do not access pb->opaque for custom IO.Reimar Döffinger2013-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As the name indicates we can't just assume what the "opaque" field contains. This fixes a crash in third-party applications see e.g.: http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2126 This fixes also FFmpeg trac #2293, which is a different third-party application. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'Michael Niedermayer2013-02-241-1/+1
|\ \ | |/ | | | | | | | | | | | | * commit '56daf10e0313c5e36f43e773f457d2a99ff0df10': mov: use the format context for logging. flicvideo: avoid an infinite loop in byte run compression Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: use the format context for logging.Anton Khirnov2013-02-231-1/+1
| | | | | | | | CC:libav-stable@libav.org
* | lavf/concatdec: add the "duration" directive.Nicolas George2013-02-241-0/+15
| |
* | tools: add seek_print.Nicolas George2013-02-241-0/+1
| | | | | | | | Useful for testing seek implementations.
* | lavf/avio: check that the protocol supports the open mode.Nicolas George2013-02-241-0/+10
| | | | | | | | Fix trac ticket #2139.
* | pmpdec: check packet sizesMichael Niedermayer2013-02-241-0/+10
| | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: fix signednessMichael Niedermayer2013-02-241-2/+2
| | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: read index before creating audio streamsMichael Niedermayer2013-02-241-10/+10
| | | | | | | | | | | | | | This allows more complete checks Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: check for EOF while reading index.Reimar Döffinger2013-02-241-0/+4
| | | | | | | | | | | | | | | | Otherwise even a tiny file can trigger a huge memory allocation. Related to ticket #2298. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat: Allocate duration_error separatelyMichael Niedermayer2013-02-233-3/+13
| | | | | | | | | | | | | | This significantly reduces the memory needed per AVStream when the array is not needed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: fix cue tracknum off by 1 errorMichael Niedermayer2013-02-231-2/+4
| | | | | | | | | | | | Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtmpproto: increase APP_MAX_LENGTHMichael Niedermayer2013-02-231-2/+2
| | | | | | | | | | | | Fixes second part of Ticket2292 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtmpproto: Check APP_MAX_LENGTHMichael Niedermayer2013-02-231-2/+6
| | | | | | | | | | | | Fixes Ticket2292 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cafenc: do not leak caf->pkt_sizesPaul B Mahol2013-02-221-2/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mxg: do not leak mxg->bufferPaul B Mahol2013-02-221-4/+6
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | matroska: fix missing ,Andrea30002013-02-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use SMPTE standard notation when showing mxf Universal Labels.Carl Eugen Hoyos2013-02-211-1/+4
| |
* | lavf/microdvd: fix muxing.Clément Bœsch2013-02-212-3/+20
| | | | | | | | This was broken since 1f265f52.
* | lavf/swfdec: remove 8-bit audio FIXME.Clément Bœsch2013-02-211-1/+0
| | | | | | | | Implemented since 624fb5f9.
* | lavf/swfdec: support 8-bits PCM audio.Clément Bœsch2013-02-201-1/+4
| |
* | lavf/swfdec: factorize the creation of a new stream.Clément Bœsch2013-02-201-26/+25
| | | | | | | | This also makes the changes of a3949fe11 applicable in both cases.
* | mov: fix self referencing timecode tracksMichael Niedermayer2013-02-201-1/+1
| | | | | | | | | | | | | | Fixes read after free. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskaenc: avoid assert failure in case of cuepoints with duplicated PTSStefano Sabatini2013-02-201-2/+8
| | | | | | | | | | | | | | | | | | | | Avoid to write more than one cuepoint per track and PTS in mkv_write_cues(). This avoids a later assertion failure on "(bytes >= needed_bytes)" in put_ebml_num() called from end_ebml_master(), in case there are several cuepoints per track with the same PTS. This may happen with files containing packets with duplicated PTS in the same track.
* | nutenc: only write an index if there are syncpointsMichael Niedermayer2013-02-181-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_gen_search: Fix finding the maximum timestamp in a really small fileMichael Niedermayer2013-02-181-2/+2
| | | | | | | | | | | | | | Fixes Assertion failure Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_read_timestamp: check stream_index before using it as array indexMichael Niedermayer2013-02-181-1/+4
| | | | | | | | | | | | | | Fixes out of array read Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "swfenc: use av_get_audio_frame_duration() instead of ↵Carl Eugen Hoyos2013-02-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | AVCodecContext.frame_size" This reverts commit 620b88a302d522f71a6a95aff500cf7bd8520043. Fixes ticket #2272. Conflicts: libavformat/swfenc.c
* | lavf: dont try to find fps for attached picturesMichael Niedermayer2013-02-151-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.rogerdpack2013-02-152-3/+1
| | | | | | | | | | | | Also cleanup exported symbols Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Removing network.h from matroskadec.cVignesh Venkatasubramanian2013-02-141-1/+0
| | | | | | | | | | | | | | Removing accidentally added include file. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix a few "its" vs "it's" typo.Clément Bœsch2013-02-141-1/+1
| |
* | Adding AlphaMode element to Matroska ParserVignesh Venkatasubramanian2013-02-142-0/+7
| | | | | | | | | | | | | | | | | | Adding support for parsing AlphaMode element in the Track header and export that information as a metadata tag. This flag indicates presence of alpha channel data in BlockAdditional element. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhdMichael Niedermayer2013-02-141-2/+5
| | | | | | | | | | | | | | Other software does not store it in this case, and the information is provided by the codec stream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Write the fiel atom to mov files independently of the used video coded.Carl Eugen Hoyos2013-02-141-3/+4
| | | | | | | | | | | | | | | | | | | | | | The QuickTime specification does not contain any hint that the atom must not be written in some cases and both the QuickTime and the AVID decoders do not fail if the atom is present. This change allows to signal (visually) interlaced streams with a codec different from uncompressed video. As a side-effect, this fixes ticket #2202
* | matroskadec: simplify additional_id writing codeMichael Niedermayer2013-02-141-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Adding support for parsing BlockAdditionalVignesh Venkatasubramanian2013-02-142-4/+44
| | | | | | | | | | | | | | | | | | | | | | Matroska specification lists support for BlockAdditional element which is not supported by ffmpeg's matroska parser. This patch adds grammar definitions for parsing that element (and few other related elements) and then puts the data in AVPacket.side_data with new AVPacketSideDataType AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | WAV muxer: reindentDaniel Verkamp2013-02-131-13/+13
| |
* | lavf/concatdec: allow probing.Nicolas George2013-02-131-1/+2
| |
OpenPOWER on IntegriCloud