summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* ff_network_wait_fd_timeout(): check for interrupt before operationAndrey Utkin2013-07-12
| | | | | Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix compilation with --disable-everything --enable-demuxer=aac.Carl Eugen Hoyos2013-07-12
|
* rmdec: fix crash in case of oomPiotr Bandurski2013-07-12
| | | | | | Fixes ticket #2724 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavformat/mov.c: Skipped duplicated MOOV atomThierry Foucu2013-07-12
| | | | | | | This should fix ticket 1378 If we have parsed a moov atom, and found another one, just skip it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Supply a User-Agent header when opening rtsp streams.Carl Eugen Hoyos2013-07-11
| | | | | | Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it. Fixes ticket #2761. Reported, analyzed and tested by trac user imavra.
* lavf/segment: use AV_OPT_TIME_DURATION for time_deltaStefano Sabatini2013-07-11
| | | | Simplify.
* lavf/segment: reindent after last commitStefano Sabatini2013-07-11
|
* lavf/segment: add initial_offset optionStefano Sabatini2013-07-11
| | | | Should address trac ticket #2224.
* 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>
| * Suggest recompilation with openssl or gnutls if the https protocol is not found.Carl Eugen Hoyos2013-07-10
| | | | | | | | Fixes ticket #2765.
| * 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>
* lavf/takdec: check metadata blocks checksumPaul B Mahol2013-07-10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* 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/gif: Do not write GIF89a header if loop is set to -1.Eugene Dzhurinsky2013-07-10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vorbiscomment: Add support for embedded cover artJames Almer2013-07-09
| | | | | | | Fixes ticket #2655 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/flacdec: Share the function to parse cover art blocksJames Almer2013-07-09
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/AVFormatContext: Move fields down to match the forkMichael Niedermayer2013-07-09
| | | | | | | | | | | | | | | | | | | | avconv uses private and internal fields from libavformat, we thus must match the layout even of the fields marked non public. Otherwise ffmpegs libavformat could not be used as a dropin replacement on debian/ubuntu The current soname of libavformat was not part of any release nor are any fields marked public moved thus in theory no installed shared lib ABI breakage should occur. Still the need for this change is unfortunate and chilling. If you installed shared libs from a recent development version of libavformat that is more recent than the last release. You probably want to check or rebuild applications that linked to it. minor versions of avformat & avdevice are bumped to allow detecting this as both use the updated struct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Force correct extradata for AVID AVCI50 in mov.Carl Eugen Hoyos2013-07-09
| | | | | | Fixes ticket #2106. Reviewed-by: Kieran Kunhya
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-09
|\ | | | | | | | | | | | | * qatar/master: movenc: Rename the timestamp parameter to dts in write_hint_packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Rename the timestamp parameter to dts in write_hint_packetsMartin Storsjö2013-07-08
| | | | | | | | | | | | This matches its actual intended use better. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'Michael Niedermayer2013-07-09
|\| | | | | | | | | | | | | * commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830': movenc: Make sure the RTP hint tracks have nondecreasing DTS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Make sure the RTP hint tracks have nondecreasing DTSMartin Storsjö2013-07-08
| | | | | | | | | | | | | | | | | | The RTP timestamps can be decreasing for codecs with B-frames. For these cases, make sure the timestamps in the MP4 file track itself are nondecreasing, and add an offset to the RTP packet hint instead to produce the intended RTP timestamp. Signed-off-by: Martin Storsjö <martin@martin.st>
* | WebM muxer writes WebVTT subtitle trackMatthew Heaney2013-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Matroska muxer now allows WebVTT subtitle tracks to be written while in WebM muxing mode. WebVTT subtitle tracks have four kinds: "subtitles", "captions", "descriptions", and "metadata". Each text track kind has a distinct Mastroska CodecID and track type, as described in the temporal metadata guidelines here: http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm When the stream has codec id AV_CODEC_ID_WEBVTT, the stream packet is serialized per the temporal metadata guidelines cited above. The WebVTT cue is written as a Matroska block group. The block frame comprises the WebVTT cue id, followed by the cue settings, followed by the cue text. (The block timestamp is synthesized from the cue timestamp.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: read stream bitrates from isml manifestAlexandre Sicard2013-07-08
| | | | | | | | | | | | | | | | This allows to read a live isml movie and segment it using the smoothstreaming muxer, which requires the bitrates to be known for each stream. Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3dec: detect CBR and use CBR axiom to seekMichael Niedermayer2013-07-08
| | | | | | | | | | | | | | This should also work reasonable with truncated and growing mp3s. Fixes Ticket2590 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'Michael Niedermayer2013-07-08
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f054e309c58894450a5d18cce9799ef58aab9f14': qdm2: use init_static_data westwood_vqa: do not free extradata on error in read_header Conflicts: libavformat/westwood_vqa.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * westwood_vqa: do not free extradata on error in read_headerLuca Barbato2013-07-07
| | | | | | | | | | | | | | | | The extradata is already freed by avformat_open_input on failure. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'Michael Niedermayer2013-07-08
|\| | | | | | | | | | | | | | | | | | | * commit '21732063a346475eb22c332b27e8216b79f9ad4a': movenc: K&R formatting cosmetics Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: K&R formatting cosmeticsMartin Storsjö2013-07-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * Makefile: Remove stray tabsMichael Niedermayer2013-07-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * yuv4mpeg: Correctly round chroma up for odd luma sizesRonald S. Bultje2013-07-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rmdec: Use the AVIOContext given as parameter in rm_read_metadata()Michael Niedermayer2013-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes crashes when playing back certain RealRTSP streams. When invoked from the RTP depacketizer, the full realmedia demuxer isn't invoked, but only certain functions from it, where a separate AVIOContext is passed in as parameter (for the buffer containing the data to parse). The functions called from within those entry points should only be using that parameter, not s->pb. In the depacketizer case, s is the RTSP context, where ->pb is null. Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * avio: Handle AVERROR_EOF in the same way as the return value 0Michael Niedermayer2013-07-07
| | | | | | | | | | | | | | | | | | This makes sure the ffurl_read_complete function actually returns the number of bytes read, as the documentation of the function says, even if the underlying protocol uses AVERROR_EOF instead of 0. Signed-off-by: Martin Storsjö <martin@martin.st>
* | 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>
* | mmsh: reimplement seekingMichael Niedermayer2013-07-07
| | | | | | | | | | | | Fixes Ticket2682 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/mp3dec: read TOC even if not all needed information is availableMichael Niedermayer2013-07-07
| | | | | | | | | | | | This fixes hyothetical bugs with parsing of elements after the TOC Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: read xing toc independant of usetoc, only skip filling ↵Michael Niedermayer2013-07-07
| | | | | | | | | | | | | | | | index if requested Fixes hypothetical parsing bug with -usetoc 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/Makefile: remove stray tabMichael Niedermayer2013-07-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-07
|\| | | | | | | | | | | | | | | | | | | * qatar/master: wtv: Mark attachment with a negative stream id Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: Mark attachment with a negative stream idLuca Barbato2013-07-07
| | | | | | | | | | | | | | | | | | A sid 0 would be mismatched to the attachment. Prevent NULL pointer dereference. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'Michael Niedermayer2013-07-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6516632967da5e6bd7d6136e8678f826669ed26e': tests: Only run noproxy test if networking is enabled fifo: K&R formatting cosmetics Conflicts: libavformat/Makefile libavutil/fifo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tests: Only run noproxy test if networking is enabledDiego Biurrun2013-07-06
| |
* | avformat/mov: Fix duration of fragmented movMichael Niedermayer2013-07-07
| | | | | | | | | | | | Fixes Ticket2757 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparseskeleton: avoid header parsing failureMichael Niedermayer2013-07-06
| | | | | | | | | | | | Based on description by James Almer and the xiph wiki Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: use ff_find_last_ts()Michael Niedermayer2013-07-06
| | | | | | | | | | | | Fixes finding the duration for nut files that are truncated 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>
* | replace some deprecated definesPaul B Mahol2013-07-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | oggparseskeleton: Replace avpriv_report_missing_feature() with a normal ↵James Almer2013-07-06
| | | | | | | | | | | | | | | | av_log() call since there should not be more than one fisbone for a given stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>