summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAge
* ff_gen_search: fix infinite loopMichael Niedermayer2013-06-18
| | | | | | Fixes Ticket2639 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ff_gen_search: fix limitMichael Niedermayer2013-06-18
| | | | | | The limit value could become slightly wrong in the last iteration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ff_gen_search: make step 64it to prevent hypothetical integer overflowMichael Niedermayer2013-06-18
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'Michael Niedermayer2013-06-17
|\ | | | | | | | | | | | | | | | | | | * commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef': avf: move url utility functions in a separate file Conflicts: libavformat/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avf: move url utility functions in a separate fileLuca Barbato2013-06-16
| |
* | Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'Michael Niedermayer2013-06-16
|\| | | | | | | | | | | | | | | | | | | | | * commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1': avf: move ff_write_chained to mux.c Conflicts: libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avf: move ff_write_chained to mux.cLuca Barbato2013-06-16
| |
* | Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'Michael Niedermayer2013-06-16
|\| | | | | | | | | | | | | | | | | | | * commit '508998f7d5cc61c7ac7b049813b47adc24c6e282': avf: move riff tags accessors where they belong Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avf: move riff tags accessors where they belongLuca Barbato2013-06-16
| |
* | Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'Michael Niedermayer2013-06-16
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c': avf: move ff_http_match_no_proxy to network Conflicts: libavformat/internal.h libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avf: move ff_http_match_no_proxy to networkLuca Barbato2013-06-16
| | | | | | | | It is only used by network protocols.
* | Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'Michael Niedermayer2013-06-16
|\| | | | | | | | | | | | | | | | | | | * 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-16
| |
* | lavf: show APIC for tta files tooPaul B Mahol2013-06-16
| | | | | | | | | | | | Fixes #2676. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | audio frame multi-threaded decodingPaul B Mahol2013-06-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'Michael Niedermayer2013-05-28
|\| | | | | | | | | | | | | * 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-28
| |
* | avformat/utils: Keep internal and external av_read_frame() packets in sync.Dale Curtis2013-05-23
| | | | | | | | | | | | | | | | | | | | | | 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-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-16
| |
* | Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-04
| |
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-05-04
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-04
| | | | | | | | | | | | Also document that it has no effect.
| * | lavf: call the new seek API from the old.Nicolas George2013-05-04
|/ / | | | | | | | | | | | | | | 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-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-03
| |
* | avformat: fix orig_pos type to match pkt->posPaul B Mahol2013-04-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: change seeking index consistency asserts to av_assertsMichael Niedermayer2013-04-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Dont stop probing before the whole id3 tag is readMichael Niedermayer2013-04-18
| | | | | | | | | | | | | | | | 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-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-04
| | | | | | | | | | 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-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: fix atomatic format selection for (s)segmentMichael Niedermayer2013-04-02
| | | | | | | | | | | | 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-30
| | | | | | | | estimated.
* | ffmpeg/avformat: factor av_guess_frame_rate() outMichael Niedermayer2013-03-29
| | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | 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-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Fix infinite probing that reads the whole fileMichael Niedermayer2013-03-20
| | | | | | | | | | | | | | 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-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: avformat_seek_file(): validate stream_index.Nicolas George2013-03-20
| |
* | append_packet_chunked: remove outcommented codeMichael Niedermayer2013-03-18
| | | | | | | | | | | | | | 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-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'Michael Niedermayer2013-03-16
|\| | | | | | | | | | | | | | | | | | | * 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-15
| | | | | | | | | | | | 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-11
| |
* | Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | * 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-11
| |
| * lavf: remove disabled FF_API_READ_PACKET cruftAnton Khirnov2013-03-11
| |
| * lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruftAnton Khirnov2013-03-11
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 07:46:18 +0000