summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf/segment: set segment end time when the first packet arrivesStefano Sabatini2014-07-17
| | | | | | Avoid negative durations in case there is a single packet in the current segment, since in that case the end time is still set to the previous segment end time.
* lavf/segment: fix weird indentStefano Sabatini2014-07-17
|
* lavf/segment: show incoming packet duration in debug messageStefano Sabatini2014-07-17
|
* lavf/segment: only use reference frames for computing the segment end timeStefano Sabatini2014-07-17
| | | | | | | This avoids a systematic overestimate of the segments duration when there are several streams. Fix trac ticket #3724.
* avformat/dv: implement fallback in dv_extract_pack()Michael Niedermayer2014-07-17
| | | | | | | | | Fixes Ticket2340 Fixes Ticket2341 Based-on mail from Dave Rice <dave@dericed.com> Tested-by: Dave Rice <dave@dericed.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'Michael Niedermayer2014-07-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '324ff59444ff5470bb325ff1e2be7c4b054fc944': avpacket: Check for and return errors in ff_interleave_add_packet() Conflicts: libavformat/audiointerleave.c libavformat/internal.h libavformat/mux.c See: 4d7c71c36467331f1e0c0f17af9f371d33308a9c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: Check for and return errors in ff_interleave_add_packet()Nidhi Makhijani2014-07-17
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | libavformat/segment: change segment_list_size behavior to match ↵Simon Thelen2014-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hls_list_size behavior. Make the segment muxer keep segment_list_size segments instead of segment_list_size + 1 segments. This patch also changes the documentation for segment_list_size to reduce possible confusion over how many segments are kept. this allows the segment list to be limited to containing only one segment which used to be impossible because a segment_list_size of 0 kept all the segments and a segment_list_size of 1 kept 2 segments. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Micro bump for "md5enc: add format_version, to allow selecting ↵Michael Niedermayer2014-07-16
| | | | | | | | | | | | | | which version to use" Suggested-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/md5enc: add format_version, to allow selecting which version to useMichael Niedermayer2014-07-16
| | | | | | | | | | | | | | Currently there is just version 1 Fixes remaining part of Ticket2280 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: fix declaration after statementMichael Niedermayer2014-07-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Add WebM DASH Manifest MuxerVignesh Venkatasubramanian2014-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the ability to generate WebM DASH manifest XML using ffmpeg. A sample command line would be as follows: ffmpeg \ -f webm_dash_manifest -i video1.webm \ -f webm_dash_manifest -i video2.webm \ -f webm_dash_manifest -i audio1.webm \ -f webm_dash_manifest -i audio2.webm \ -map 0 -map 1 -map 2 -map 3 \ -c copy \ -f webm_dash_manifest \ -adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \ manifest.xml It works by exporting necessary fields as metadata tags in matroskadec and use those values to write the appropriate XML fields as per the WebM DASH Specification [1]. Some ideas are adopted from webm-tools project [2]. [1] https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification [2] https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/ Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroska: Add functions for WebM DASH ManifestVignesh Venkatasubramanian2014-07-15
| | | | | | | | | | | | | | | | Add functions and logic to matroskadec for use by the WebM DASH Manifest XML Muxer. The actual muxer is added in a future patch. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add av_stream_get_parser() to access avformat AVParserMichael Niedermayer2014-07-14
| | | | | | | | | | | | | | | | | | The AVStream.parser field is considered private and its location cannot be preserved while preserving also ABI compatibility to libav, as libav added fields before it. Some tools like ffmpeg.c access this field though Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: dont mark multichannel as mono tracks as containing the ↵Michael Niedermayer2014-07-14
| | | | | | | | | | | | | | | | center channel Fixes Ticket3727 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavdec: add basic sanity check for the sample countMichael Niedermayer2014-07-14
| | | | | | | | | | | | Fixes Ticket3708 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Try to improve skip caseMichael Niedermayer2014-07-14
| | | | | | | | | | | | Fixes Ticket3761 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add samba protocol via libsmbclientLukasz Marek2014-07-13
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AVFormat: LRC demuxer and muxerStar Brilliant2014-07-13
| | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: dvrms timestamps are pts not dtsMichael Niedermayer2014-07-13
| | | | | | | | | | | | Should fix Ticket3328 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: do not wait for packets from discarded streams for genptsMichael Niedermayer2014-07-13
| | | | | | | | | | | | | | Fixes long loop Fixes Ticket3208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: dont clear programs during probingMichael Niedermayer2014-07-12
| | | | | | | | | | | | Fixes Ticket 3763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/libssh: set freed pointers to NULLLukasz Marek2014-07-12
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: use av_mallocz_array()Paul B Mahol2014-07-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/mpegts: skip updating programs/streams when determining durationMichael Niedermayer2014-07-11
| | | | | | | | | | | | Fixes Ticket2441 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'Michael Niedermayer2014-07-11
|\| | | | | | | | | | | | | | | | | | | * commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e': mov: Clarify tkhd flag settings Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Clarify tkhd flag settingsLuca Barbato2014-07-11
| |
* | Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'Michael Niedermayer2014-07-11
|\| | | | | | | | | | | | | | | | | | | * commit 'f90729699db9ede2bef2b28000f1795dab1b8996': mov: Do not group tracks if more than one is enabled per type Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Do not group tracks if more than one is enabled per typeLuca Barbato2014-07-11
| | | | | | | | The specification requires at most 1 track enabled per alternate group.
* | avformat/cdg: Do not fail if filesize cannot be determinedMichael Niedermayer2014-07-11
| | | | | | | | | | | | This fixes cdg with piped input which was broken by the previous commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'Michael Niedermayer2014-07-11
|\| | | | | | | | | | | | | * commit '44386aaad870cbd80ae0d08247ebc663476446ff': cdg: Forward error from avio_size() in read_header() function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdg: Forward error from avio_size() in read_header() functionNidhi Makhijani2014-07-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mpegts: pass MpegTSContext ptr explicitlyAlexander V. Lukyanov2014-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AVFormatContext->priv_data is not always a MpegTSContext, it can be RTSPState when decoding a RTP stream. So it is necessary to pass MpegTSContext pointer explicitly. Within libav, the write_section_data function doesn't actually use the MpegTSContext at all, so this doesn't change anything at the moment (no memory was corrupted before), but it reduces the risk of anybody trying to touch the MpegTSContext via AVFormatContext->priv_data in the future. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/hlsenc: correctly compute target durationNicolas Martyanoff2014-07-10
| | | | | | | | | | | | | | | | | | | | With HLS, the duration of all segments must be lower or equal to the target duration. Therefore floor(duration + 0.5) yields incorrect results. For example, for duration = 1.35, floor(duration + 0.5) yields 1.0, but the correct result is 2.0. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit '0307cc2253e76772b1c645ac6117d08da87a147c': rtpdec: pass an AVFormatContext to ff_parse_fmtp() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: pass an AVFormatContext to ff_parse_fmtp()Anton Khirnov2014-07-09
| | | | | | | | Use it for logging, instead of NULL or the stream codec context.
* | Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | * commit '650d384048ed42579cc6d67bf32a94b468c0b6cb': yuv4mpegenc: do not access AVCodecContext.coded_frame Conflicts: libavformat/yuv4mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yuv4mpegenc: do not access AVCodecContext.coded_frameAnton Khirnov2014-07-09
| | | | | | | | | | | | | | | | Its contents are meaningful only if the stream codec context is the one actually used for encoding, which is often not the case (and is discouraged). Use AVCodecContext.field_order instead.
* | Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit '27c1f82f561932c83191bcd3e70e0cb1712485ba': nsvdec: remove commented out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nsvdec: remove commented out cruftAnton Khirnov2014-07-09
| |
* | Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f': mov: free the dv demux context with avformat_free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: free the dv demux context with avformat_free_context()Anton Khirnov2014-07-09
| |
* | Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb': mtv: do not set sample_rate for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mtv: do not set sample_rate for videoAnton Khirnov2014-07-09
| |
* | Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | * commit 'b8604a976128ffbd316653cdec11ba487f1025bb': oggparsecelt: do not set AVCodecContext.frame_size Conflicts: libavformat/oggparsecelt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsecelt: do not set AVCodecContext.frame_sizeAnton Khirnov2014-07-09
| | | | | | | | It is supposed to be set by decoders only.
* | Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6': adxdec: get rid of an avpriv function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adxdec: get rid of an avpriv functionAnton Khirnov2014-07-09
| | | | | | | | | | The only thing the demuxer needs is the sample rate to set the timebase, which can be simply read with AV_RB32.
* | Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov2014-07-09
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 23:58:09 +0000