aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'Michael Niedermayer2013-06-161-150/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'afc8685395e775fe0f2a1698b683aea4afd124af': avf: split off format register and lookup function Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avf: split off format register and lookup functionLuca Barbato2013-06-161-146/+0
| |
* | lavf: show APIC for tta files tooPaul B Mahol2013-06-161-1/+2
| | | | | | | | | | | | Fixes #2676. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | audio frame multi-threaded decodingPaul B Mahol2013-06-051-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'Michael Niedermayer2013-05-281-0/+7
|\| | | | | | | | | | | | | * commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2': lavf: preserve side data when parsing packets. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: preserve side data when parsing packets.Anton Khirnov2013-05-281-0/+7
| |
* | avformat/utils: Keep internal and external av_read_frame() packets in sync.Dale Curtis2013-05-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | Otherwise, during error conditions, the caller will be left with dangling pointers to a destructed packet => boom. BUG=242786 TEST=ffmpeg_regression_tests Commit slightly simplified by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-161-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-161-2/+0
| |
* | Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer2013-05-051-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0f8be6413b6a8d334d6052e610af32935c310af': avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate Conflicts: libavformat/ac3dec.c libavformat/avformat.h libavformat/avs.c libavformat/m4vdec.c libavformat/mov.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegvideodec.c libavformat/psxstr.c libavformat/pva.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriateDiego Biurrun2013-05-041-5/+5
| |
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-05-041-1/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/matroskaenc: return an error for unsupported types. lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD. lavf: filter out AVSEEK_FLAG_BACKWARD in new API. lavf: call the new seek API from the old. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf: filter out AVSEEK_FLAG_BACKWARD in new API.Nicolas George2013-05-041-0/+1
| | | | | | | | | | | | Also document that it has no effect.
| * | lavf: call the new seek API from the old.Nicolas George2013-05-041-1/+13
|/ / | | | | | | | | | | | | | | If the demuxer implements read_seek2() and not read_seek(), call avformat_seek_file() from av_seek_frame(). Allow to properly seek in formats that only implement the new API from applications that use the old one. Tested with mplayer and a concat script.
* | Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer2013-05-041-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * silly typo fixesDiego Biurrun2013-05-031-3/+3
| |
* | avformat: fix orig_pos type to match pkt->posPaul B Mahol2013-04-231-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: change seeking index consistency asserts to av_assertsMichael Niedermayer2013-04-191-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Dont stop probing before the whole id3 tag is readMichael Niedermayer2013-04-181-0/+2
| | | | | | | | | | | | | | | | When a file appears to start with a id3 tag and appears to also be something else, then try to increase the probe buffer size if its below its limit. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 22:55:10 +0000