aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-081-3/+6
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: fix the comparison in an overflow check Conflicts: libavformat/utils.c See: a5d67bc796e1f9a2b99b43ea807166b655e4bdbc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: fix the comparison in an overflow checkAnton Khirnov2013-09-071-1/+1
| | | | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat: make avformat_close_input() more tolerant.Clément Bœsch2013-09-041-2/+8
| | | | | | | | | | The purpose of this commit is to make error management simpler and less error prone, just like av_free() which is safe with NULL.
* | avformat/utils: assert position monotonicity in ff_find_last_ts()Michael Niedermayer2013-09-041-0/+1
| | | | | | | | | | | | | | This ensures that no read timestamp functions finds packets before the search window in ff_find_last_ts() which could cause an infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Fix bitrate overflow checkMichael Niedermayer2013-09-031-6/+3
| | | | | | | | | | | | | | | | | | The check added in df33a58e5311ee9a64a573889b883a80e981af7b does not work at all, rather it broke the summing of bitrates completely. The comparission was wrong way around. This commit replaces it by a simpler and hopefully clearer check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'Michael Niedermayer2013-09-031-2/+7
|\| | | | | | | | | | | | | * commit 'df33a58e5311ee9a64a573889b883a80e981af7b': lavf: avoid integer overflow when estimating bitrate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: avoid integer overflow when estimating bitrateAnton Khirnov2013-09-021-2/+7
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'Michael Niedermayer2013-09-031-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303': lavf: move a variable declaration to the block where it's used Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move a variable declaration to the block where it's usedAnton Khirnov2013-09-021-2/+2
| |
* | avformat/utils: fix duration_fields calculation when need_parsing=0Michael Niedermayer2013-09-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix av_probe_input_buffer2() so it returns the probe scoreMichael Niedermayer2013-08-291-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: export probe scoreMichael Niedermayer2013-08-281-4/+19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: move PROBE_BUF_M* to internal.hMichael Niedermayer2013-08-261-4/+0
| | | | | | | | | | | | They will be used by the mp3 probe function in the next commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.Alexis Ballier2013-08-131-16/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Integrate accessors.h header into internal.hReimar Döffinger2013-08-101-1/+0
| | | | | | | | | | | | | | I have no idea why I added a separate header, I think there is no good reason for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Reduce MAKE_ACCESSORS code duplication via a new header.Reimar Döffinger2013-08-081-4/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat/utils: fix memleak with nobufferMichael Niedermayer2013-08-071-3/+3
| | | | | | | | | | | | Fixes Ticket2802 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-031-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7950e519bb094897f957b9a9531cc60ba46cbc91': Disable deprecation warnings for cases where a replacement is available Conflicts: libavcodec/avpacket.c libavcodec/pthread.c libavcodec/utils.c libavdevice/v4l2.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Disable deprecation warnings for cases where a replacement is availableDiego Biurrun2013-08-021-0/+3
| |
* | Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'Michael Niedermayer2013-07-291-1/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34': lavf: Don't interpret just slightly broken timestamps as wraparound Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Don't interpret just slightly broken timestamps as wraparoundMichael Niedermayer2013-07-291-2/+3
| | | | | | | | | | | | | | This avoids breaking some slightly incorrect (dts > pts) timestamps in sample HLS streams from Apple. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "avformat/utils: Close codec context since it is allocated by ↵Michael Niedermayer2013-07-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | avformat_new_stream in refrence to ticket 2716" This causes a race condition with VLC. Its plausible that other applications also would have races with it and its just fixing a memleak when the user application forgets to free the codec. It causes more problems than it solves in its current form, thus the revert. Better solutions are welcome This reverts commit 0f229f9b91fe3c4ebd97e88f004d638819b76add.
* | avformat/utils: Close codec context since it is allocated by ↵Anshul Maheshwari2013-07-211-0/+3
| | | | | | | | | | | | avformat_new_stream in refrence to ticket 2716 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-161-0/+3
|\| | | | | | | | | | | | | * qatar/master: lavf: Make sure avg_frame_rate can be calculated without integer overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Make sure avg_frame_rate can be calculated without integer overflowMartin Storsjö2013-07-151-0/+3
| | | | | | | | | | | | | | | | | | If either of the deltas is too large for the multiplications to succeed, don't use this for setting the avg frame rate. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-07-101-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Suggest recompilation with openssl or gnutls if the https protocol is not found. lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/utils.c: Avoid a null pointer dereference on oom after duration_error ↵Carl Eugen Hoyos2013-07-101-0/+2
| | | | | | | | | | | | allocation.
* | | avformat/utils: avformat_find_stream_info set value for ret in case of oomPiotr Bandurski2013-07-101-1/+3
|/ / | | | | | | | | | | without it FFmpeg didn't display any error message when oom event occured Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: avformat_find_stream_info fix a crash in case of oomPiotr Bandurski2013-07-101-0/+2
| | | | | | | | | | | | fixes ticket #2767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: fallback to timestamps in analyzeduration check ↵Michael Niedermayer2013-07-081-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in more cases This fixes speex in rtmp Fixes Ticket2409 the nellymoser in flv case actually needs larger analyzeduration. The code previously just failed to calculate the duration If this causes any problems, like premature analyze/probe end, please report! Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: use fps_dts as last resort to determine durationMichael Niedermayer2013-07-071-0/+9
| | | | | | | | | | | | Fixes long delay with some hardware generated h264 in ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factor ff_find_last_ts() out of ff_gen_search()Michael Niedermayer2013-07-061-24/+39
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: move ret init down from flush codecs.Michael Niedermayer2013-07-021-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: Do not consider no streams an error in flush codecsMichael Niedermayer2013-07-021-1/+1
| | | | | | | | | | | | | | This should have no functional effect, but allows a cleaner diff when moving it down Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: try to preserve the error codeMichael Niedermayer2013-07-021-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_find_stream_info: initialize retMichael Niedermayer2013-07-021-1/+1
| | | | | | | | | | | | This should fix hypothetical corner cases where it might have never been initialized before use Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Print "Consider increasing the value for analzeduration and ↵Carl Eugen Hoyos2013-07-021-12/+15
| | | | | | | | | | | | | | | | | | | | | | probesize" even more often The sample from ticket #2691 currently does not trigger "Consider increasing the value for analzeduration and probesize" because the audio streams are only added after calling estimate_timings(). Attached patch moves the message below this function call. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cosmetics: Fix "dont" "wont" "doesnt" typosTimothy Gu2013-06-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: silence max_analyze_duration warningwm42013-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is part of normal operation with some formats. A warning should indicate that something is wrong, and the documentation for AV_LOG_WARNING says: "Something somehow does not look correct." Since this message is most likely useful for debugging only, raise the log level accordingly. Plus-one-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_gen_search: fix infinite loopMichael Niedermayer2013-06-181-1/+1
| | | | | | | | | | | | Fixes Ticket2639 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_gen_search: fix limitMichael Niedermayer2013-06-181-1/+3
| | | | | | | | | | | | 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-181-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'Michael Niedermayer2013-06-171-113/+0
|\| | | | | | | | | | | | | | | | | | | * 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-161-113/+0
| |
* | Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'Michael Niedermayer2013-06-161-22/+0
|\| | | | | | | | | | | | | | | | | | | | | * 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-161-18/+0
| |
* | Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'Michael Niedermayer2013-06-161-9/+0
|\| | | | | | | | | | | | | | | | | | | * 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-161-9/+0
| |
* | Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'Michael Niedermayer2013-06-161-54/+0
|\| | | | | | | | | | | | | | | | | | | | | * 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-161-54/+0
| | | | | | | | It is only used by network protocols.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 16:47:03 +0000