summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* asfdec: dont truncate type 2-5 valuesMichael Niedermayer2013-03-051-3/+4
| | | | | | | Fixes use of uninitialized variables and possible out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concat: compute duration if possible.Nicolas George2013-03-051-0/+13
|
* Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"Nicolas George2013-03-052-2/+1
| | | | | | | | | | | | | This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88. Conflicts: libavformat/version.h Allowing to automatically select the concat demuxer raises security concerns, as it allows a possibly hostile file to access any file on the system. Guessing the format based on the file name extension does not allow to enable the safe mode designed to avoid it.
* mp3dec: Fix VBR bit rate parsingAlexander Kojevnikov2013-03-051-2/+4
| | | | | | | | | | | When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* iff: fix integer overflowMichael Niedermayer2013-03-051-0/+3
| | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* update_stream_timings: check bitrate for being in range.Michael Niedermayer2013-03-041-1/+3
| | | | | | | Fixes numerical overflow Fixes Ticket2089 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: Make duration estimation from pts more robustMichael Niedermayer2013-03-042-1/+5
| | | | | | | Ignore durations which differ significantly from the previous Fixes Ticket2018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutdec: more specific return codes for decode_syncpoint()Michael Niedermayer2013-03-041-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutdec: print error on invalid/unsupported fourcc styleMichael Niedermayer2013-03-041-1/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-03-041-1/+1
|\ | | | | | | | | | | | | | | | | | | * cehoyos/master: buildsys: only include log2_tab per library for shared builds Add h264chroma dependency for cavs decoder to configure. Add h264qpel dependency for snow codec to configure. Add h264chroma dependency for vp5 and vp6 decoder to configure. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * buildsys: only include log2_tab per library for shared buildsMichael Niedermayer2013-03-041-1/+1
| | | | | | | | | | | | Fix linking failures with -all_load due to multiple log2_tabs Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-039-19/+17
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat: gather aspect ratio from rv30/40 in find_stream_infoMichael Niedermayer2013-03-031-0/+3
| | | | | | | | | | | | Fixes Ticket1550 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-03-032-1/+10
|\ \ | |/ | | | | | | | | | | * cehoyos/master: movenc: Do not flag secondary audio and subtitle tracks as enabled. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Do not flag secondary audio and subtitle tracks as enabled.Michael Niedermayer2013-03-032-1/+10
| | | | | | | | | | | | Fixes ticket #468 and ticket #1174. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-032-2/+2
|\ \ | |/ |/| | | | | | | | | * qatar/master: rtpdec: Initialize some variables to silence compiler warnings Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Initialize some variables to silence compiler warningsMartin Storsjö2013-03-022-2/+2
| | | | | | | | | | | | | | | | The warnings are false positives, older gcc versions (such as 4.5) think the variables can be used uninitialized while they in practice can't, while newer (4.6) gets it right. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Avoid huge memory allocations from asf demuxer.Carl Eugen Hoyos2013-03-021-0/+1
| | | | | | | | Fixes ticket #1888.
* | Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'Michael Niedermayer2013-03-021-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9': h264: do not copy ref count/ref2frm when updating per-frame context flvdec: Check the return value of a malloc Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Check the return value of a mallocMartin Storsjö2013-03-021-2/+6
| | | | | | | | | | | | | | | | | | | | The callers of this function can't report errors sanely. If this one malloc fails, don't write the extradata byte, make sure we try to malloc it the next time we're called instead, and make sure we still consume the input data byte. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'Michael Niedermayer2013-03-021-7/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'c91c63b5380bf79655c09320774a022f84d76fd5': flvdec: Don't read the VP6 header byte when setting codec type based on metadata Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Don't read the VP6 header byte when setting codec type based on metadataMartin Storsjö2013-03-021-7/+9
| | | | | | | | | | | | | | | | | | This header byte is only present when actually reading a VP6 frame, not when reading the codec type field in the metadata. This potential bug has been present since 5b54a90c. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | 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>
OpenPOWER on IntegriCloud