aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'Michael Niedermayer2013-04-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbb1425811a672eddf4acf0513237cdf20f83756': lavf: make sure stream probe data gets freed. avfiltergraph: set deprecated filter_count. Conflicts: libavformat/utils.c See: 44a7a6300d104dd453bcd5c601e9c6944fb34679 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make sure stream probe data gets freed.Anton Khirnov2013-04-041-0/+1
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | avformat: Add a mechanism to allow demuxers to detect byte based seeking.Michael Niedermayer2013-04-041-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: fix atomatic format selection for (s)segmentMichael Niedermayer2013-04-021-0/+4
| | | | | | | | | | | | Fixes Ticket2236 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not show "Estimating duration from bitrate" warning if no duration was ↵Carl Eugen Hoyos2013-03-301-2/+4
| | | | | | | | estimated.
* | ffmpeg/avformat: factor av_guess_frame_rate() outMichael Niedermayer2013-03-291-0/+16
| | | | | | | | | | | | This will be used in ffplay Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_bit_rate: Check timebase and bitrateMichael Niedermayer2013-03-281-2/+4
| | | | | | | | | | | | | | Fixes integer overflow and assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: change some seeking related assert to av_assertsMichael Niedermayer2013-03-271-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Fix infinite probing that reads the whole fileMichael Niedermayer2013-03-201-0/+2
| | | | | | | | | | | | | | Fixes: otonajoshi_avformat_tries_to_load_whole.ts Reported-by: JEEB (on IRC) Thanks-to: nevcairiel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_find_stream_info: change read_size to 64bitMichael Niedermayer2013-03-201-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: avformat_seek_file(): validate stream_index.Nicolas George2013-03-201-0/+2
| |
* | append_packet_chunked: remove outcommented codeMichael Niedermayer2013-03-181-9/+0
| | | | | | | | | | | | | | our variant works fine and should be better also remove related unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | append_packet_chunked: Remove unused initialization.Michael Niedermayer2013-03-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'Michael Niedermayer2013-03-161-24/+61
|\| | | | | | | | | | | | | | | | | | | * commit 'aa3c77998404cc32233cb76e961ca27db8565459': lavf: sanity check size in av_get/append_packet(). Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: sanity check size in av_get/append_packet().Anton Khirnov2013-03-151-19/+49
| | | | | | | | | | | | To avoid allocating ridiculous amounts of memory for corrupted files, read the input in chunks limited to filesize or an arbitrary large amount when that is not known (chosen to be 50M).
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-111-59/+0
| |
* | Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'Michael Niedermayer2013-03-131-7/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '7b486ab13bfcfa88a7cd92586de50e49966ec292': lavf: remove disabled FF_API_AV_GETTIME cruft lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_AV_GETTIME cruftAnton Khirnov2013-03-111-7/+0
| |
| * lavf: remove disabled FF_API_READ_PACKET cruftAnton Khirnov2013-03-111-8/+0
| |
| * lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruftAnton Khirnov2013-03-111-7/+0
| |
* | avformat: keep r_frame_rateMichael Niedermayer2013-03-121-0/+6
| | | | | | | | | | | | This field is used and nothing equivalent exists Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-081-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-081-5/+14
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-071-5/+5
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: Fix apics with aacMichael Niedermayer2013-03-071-1/+1
| | | | | | | | | | | | Fixes Ticket2318 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-041-1/+3
| | | | | | | | | | | | | | Ignore durations which differ significantly from the previous Fixes Ticket2018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-031-5/+5
| | | | | | | | | | | | | | 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>
* | 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-281-0/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: Handle the environment variable no_proxy more properlyMartin Storsjö2013-02-271-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * lavf: fix arithmetic overflows in avformat_seek_file()Mans Rullgard2012-12-081-1/+1
| | | | | | | | | | | | | | | | The values compared here can be more than INT64_MAX apart. Since the difference is always positive, converting to uint64_t before subtracting gives the correct result without overflows. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | 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>
* | avformat: Allocate duration_error separatelyMichael Niedermayer2013-02-231-2/+10
| | | | | | | | | | | | | | This significantly reduces the memory needed per AVStream when the array is not needed. 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>
* | lavf: dont try to find fps for attached picturesMichael Niedermayer2013-02-151-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add seek2any to allow forcing seeking to non keyframes via AVOptionsMichael Niedermayer2013-02-071-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: provide feedback in case of invalid probe sizeStefano Sabatini2013-01-191-0/+2
| | | | | | | | | | Log message in case the max_probe_size value in av_probe_input_buffer() is smaller than the minimum accepted value.
* | Add a new function av_codec_get_tag2().Carl Eugen Hoyos2013-01-171-2/+17
| | | | | | | | | | | | av_codec_get_tag() may return 0 both in case a codec_tag was found and if no codec_tag was found. The new function does not have this ambiguity.
* | lavf/utils: clarify/extend messages in avformat_find_stream_info()Stefano Sabatini2013-01-131-2/+2
| | | | | | | | | | In particular, specify the unit of the shown values in case the max probe size/duration is reached.
* | lavf: use avpriv_find_pix_fmt instead of ff_Michael Niedermayer2013-01-121-1/+1
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: more complete dts checksMichael Niedermayer2013-01-081-1/+2
| | | | | | | | | | | | | | Fixes division by zero Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_get_audio_frame_size: try to fix wma in wavMichael Niedermayer2013-01-061-0/+7
| | | | | | | | | | | | Fixes Ticket1905, Ticket2114 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix AVCI50 SPS to specify a SAR of 4:3 instead of 3:4.Carl Eugen Hoyos2013-01-051-2/+2
| |
* | Support more AVC-Intra filesReimar Döffinger2013-01-031-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | Followup to http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/151321 patch by Reimar and Thomas Mundt fixes some AVC-Intra files from different tickets. It does not fix http://samples.ffmpeg.org/ffmpeg- bugs/trac/ticket524/AVCI50.mov Authors of this commit are: Reimar and Thomas Mundt Patch and commit message mostly taken from ffmpeg-devel, mail by Carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add return to silence compiler warningMichael Niedermayer2013-01-031-0/+1
| | | | | | | | | | | | The added statement is not reachable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Replace references to "que" with the appropriate word.Clément Bœsch2013-01-031-2/+2
| | | | | | | | | | | | "que" sounds like a slang word to me. This commit renames a few variables, fix the comments and the logging messages (sometimes along with small other typo fixes).