summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAge
* Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-02
| |
* | Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | * 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-29
| | | | | | | | | | | | | | 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-21
| | | | | | | | | | | | | | | | | | | | | | | | 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-21
| | | | | | | | | | | | 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-16
|\| | | | | | | | | | | | | * 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-15
| | | | | | | | | | | | | | | | | | 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-10
|\ \ | | | | | | | | | | | | | | | | | | | | | * 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-10
| | | | | | | | | | | | allocation.
* | | avformat/utils: avformat_find_stream_info set value for ret in case of oomPiotr Bandurski2013-07-10
|/ / | | | | | | | | | | 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-10
| | | | | | | | | | | | fixes ticket #2767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: fallback to timestamps in analyzeduration check ↵Michael Niedermayer2013-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | 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-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: move ret init down from flush codecs.Michael Niedermayer2013-07-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_find_stream_info: Do not consider no streams an error in flush codecsMichael Niedermayer2013-07-02
| | | | | | | | | | | | | | 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-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_find_stream_info: initialize retMichael Niedermayer2013-07-02
| | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | 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-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: silence max_analyze_duration warningwm42013-06-26
| | | | | | | | | | | | | | | | | | | | | | | | 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-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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 20:43:19 +0000