aboutsummaryrefslogtreecommitdiffstats
path: root/doc/muxers.texi
Commit message (Collapse)AuthorAgeFilesLines
* Add -movflags rtphint documentation.Carl Eugen Hoyos2013-01-091-0/+2
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-091-0/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: xan: Convert to bytestream2 oggenc: add a page_duration option and deprecate the pagesize option x86: lavr: add SSE2/AVX dither_int_to_float() Conflicts: libavcodec/xan.c libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggenc: add a page_duration option and deprecate the pagesize optionJustin Ruggles2013-01-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | This uses page duration instead of byte size to determine when to buffer the page. Also, it tries to avoid continued pages by buffering the current page if there are already packets in the page and adding the next packet would require it to be continued on a new page. This can improve seeking performance. The default page duration is 1 second, which is much saner than filling all page segments by default.
* | doc/muxers: adopt new -codec:SPEC syntax in segment exampleStefano Sabatini2013-01-021-1/+1
| |
* | doc/muxers: add a dedicated section for segment examplesStefano Sabatini2013-01-021-1/+1
| |
* | doc/muxers: fix typos in the segment chapterStefano Sabatini2013-01-021-2/+2
| |
* | lavf/segment: add segment_frames optionStefano Sabatini2012-12-281-0/+15
| | | | | | | | This is meant to address trac ticket #1483.
* | lavf/segment: add reference_stream optionStefano Sabatini2012-12-281-1/+10
| |
* | lavf/segment: add segment_start_number optionStefano Sabatini2012-12-131-0/+3
| | | | | | | | Consistent with the image2 muxer.
* | lavf/segment: add reset_timestamps optionStefano Sabatini2012-12-111-0/+7
| | | | | | | | | | | | | | The new options reset the timestamps at each new segment, so that the generated segments will have timestamps starting close to 0. It is meant to address trac ticket #1425.
* | Merge commit '18e6f087c4a50bede8449ee164778945480be50c'Michael Niedermayer2012-12-091-3/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18e6f087c4a50bede8449ee164778945480be50c': img2: document the options available hls: improve options description hls: use a meaningful long name hls: add start_number option h264: check for invalid zeros_left before writing Conflicts: doc/demuxers.texi doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * img2: document the options availableLuca Barbato2012-12-081-0/+5
| |
| * hls: improve options descriptionLuca Barbato2012-12-081-4/+8
| |
| * hls: add start_number optionLuca Barbato2012-12-081-0/+1
| |
* | Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'Michael Niedermayer2012-11-141-0/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2': x86: h264_weight_10bit: port to cpuflags libtheoraenc: add missing pixdesc.h header avcodec: remove ff_is_hwaccel_pix_fmt pixdesc: add av_pix_fmt_get_chroma_sub_sample hlsenc: stand alone hls segmenter Conflicts: doc/muxers.texi libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/mpegvideo_enc.c libavcodec/tiffenc.c libavformat/Makefile libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: stand alone hls segmenterLuca Barbato2012-11-131-0/+21
| | | | | | | | Simplifies usage but has higher latency.
* | doc/muxers: document mov faststart option.Clément Bœsch2012-10-211-1/+6
| |
* | lavf/segment: add segment_list_flags optionStefano Sabatini2012-09-111-0/+26
| | | | | | | | | | | | | | | | | | | | | | Allow to specify options affecting the segment list generation. In particular: add +live and +cache flags. For a full discussion read trac ticket #1642: http://ffmpeg.org/trac/ffmpeg/ticket/1642 Also add live M3U8 generation example.
* | lavf/segment: deprecate "ext" format in favor of "csv"Stefano Sabatini2012-09-041-5/+9
| | | | | | | | The new option name is more descriptive.
* | lavf/segment: add escaping for filename field of the CSV list fileStefano Sabatini2012-09-041-2/+2
| | | | | | | | CSV escaping code is borrowed from ffprobe.c.
* | doc/muxers: simplify segment examplesStefano Sabatini2012-08-181-2/+2
| | | | | | | | The simplifications are due to the recent option changes.
* | lavf/segment: change default value for segment_list_size option, from 5 to 0Stefano Sabatini2012-08-181-1/+1
| | | | | | | | | | This is technically a major compatibility break, but seems the most natural default and what users would expect without reading the docs.
* | lavf/segment: guess list type from list filename suffixStefano Sabatini2012-08-181-3/+7
| |
* | lavf/segment: add M3U8 list supportStefano Sabatini2012-08-181-0/+4
| | | | | | | | Address trac ticket #1642.
* | Add ICO muxerMichael Bradshaw2012-08-141-0/+33
| | | | | | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: add -segment_time_delta optionStefano Sabatini2012-07-101-0/+34
| |
* | lavf/segment: add -segment_times optionStefano Sabatini2012-07-101-0/+10
| | | | | | | | Address trac ticket #1504.
* | lavf/segment: make use of av_parse_time() when parsing the -segment_time valueStefano Sabatini2012-07-081-2/+2
| | | | | | | | | | | | | | Increase flexibility/consistency. Also rename recording_time field to time, for enhanced consistency/readability.
* | doc/muxers: sort options for the segment muxerStefano Sabatini2012-07-081-2/+2
| |
* | lavf/segment: add segment_list_type option, extend format for the segment ↵Stefano Sabatini2012-07-081-0/+24
| | | | | | | | | | | | | | | | | | list file Add list extended format which specifies in the list file the start and ending time for each segment. This is required to make it available this information to external tools, avoiding the need to perform file analysis in the output segments.
* | doc/muxers/segment: apply minor documentation updates and adjustementsStefano Sabatini2012-07-041-5/+35
| | | | | | | | | | Update documentation to match code behavior after previous changes, also reword the examples section.
* | lavf/segment: fix command with missing -list optionStefano Sabatini2012-06-291-1/+1
| | | | | | | | Replace -list with the correct option -segment_list.
* | doc/muxers: add documentation for the md5 and framemd5 muxersStefano Sabatini2012-04-071-0/+60
| | | | | | | | Address trac ticket #1153.
* | doc/muxers: clarify documentation for the framecrc muxerStefano Sabatini2012-04-071-11/+17
| | | | | | | | | | Makes more explicit that framecrc works at the packet level, also prefers the term "packet" over "frame" when it makes sense.
* | doc/muxers: update documentation for the framecrc muxerStefano Sabatini2012-04-071-1/+1
| | | | | | | | | | | | | | Add mention to the pts and duration log fields, added in d2afbd9a56e4e863bad01923006dd9b77f747035. Fix trac ticket #1159.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-211-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) avconv: free packet in write_frame() when discarding due to frame number limit FATE: use +/- flag option syntax for vp8 emu-edge tests lavf: make av_interleave_packet_per_dts() private. lavf: deprecate av_read_packet(). oggdec: output correct timestamps for Vorbis avconv: pass input stream timestamps to audio encoders lavc: shrink encoded audio packet size after encoding. xa: set correct bit rate xa: do not set bit_rate, block_align, or bits_per_coded_sample xa: fix end-of-file handling xa: fix timestamp calculation bink: fix typo in FFALIGN() argument bink: align plane width to 8 when calculating bundle sizes doc: pass -Idoc texi2html and texi2pod doc: texi2pod: add -I flag movenc: Add a min_frag_duration option rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers libavformat: Set the default for the max_delay option to -1 Generate manpages for AV{Format,Codec}Context AVOptions. doc/avconv: remove entries for AVOptions. ... Conflicts: doc/Makefile doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/Makefile libavcodec/options.c libavcodec/vp8.c libavformat/options.c tests/fate/demux.mak tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add a min_frag_duration optionMartin Storsjö2012-03-201-0/+7
| | | | | | | | | | | | | | | | The other fragmentation options (frag_duration, frag_size and frag_keyframe) are combined with OR, cutting fragments at the first of the conditions being fulfilled. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-011-0/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add a minor bump, changelog/APIchanges entry and some documentation for APIC ↵Anton Khirnov2012-02-291-0/+34
| | | | | | | | support.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-291-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: Clip step_index values read from the bitstream at the beginning of each frame. oma: don't read beyond end of leaf_table. doxygen: Remove documentation for non-existing parameters; misc small fixes. Indeo3: fix crashes on corrupt bitstreams. msmpeg4: Replace forward declaration by proper #include. segment: implement wrap around avf: reorder AVStream and AVFormatContext aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message. Conflicts: libavcodec/indeo3.c libavformat/avformat.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: implement wrap aroundLuca Barbato2012-02-281-0/+2
| | | | | | | | | | | | | | | | Provide a way to wrap around the segment index so pseudostreaming live through a web server and html5 browser is simpler. Also ensure that 0 (disable) is a valid value across the options providing wrap around.
* | doc: fix convertion tool referencesMichael Niedermayer2012-02-011-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-311-5/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) avconv: deprecate the -deinterlace option doc: Fix the name of the new function aacenc: make sure to encode enough frames to cover all input samples. aacenc: only use the number of input samples provided by the user. wmadec: Verify bitstream size makes sense before calling init_get_bits. kmvc: Log into a context at a log level constant. mpeg12: Pad framerate tab to 16 entries. kgv1dec: Increase offsets array size so it is large enough. kmvc: Check palsize. nsvdec: Propagate errors nsvdec: Be more careful with av_malloc(). nsvdec: Fix use of uninitialized streams. movenc: cosmetics: Get rid of camelCase identifiers swscale: more generic check for planar destination formats with alpha doc: Document mov/mp4 fragmentation options build: Use order-only prerequisites for creating FATE reference file dirs. x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf rtsp: Remove some unused variables from ff_rtsp_connect(). avutil: make intfloat api public avformat_write_header(): detail error message ... Conflicts: doc/APIchanges doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/kmvc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_yasm.asm libavcodec/x86/pngdsp-init.c libavformat/movenc.c libavformat/movenc.h libavformat/mpegtsenc.c libavformat/nsvdec.c libavformat/utils.c libavutil/avutil.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Document mov/mp4 fragmentation optionsMartin Storsjö2012-01-301-0/+61
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-201-0/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: clear trailing bits in partially parsed NAL units vc1: Handle WVC1 interlaced stream xl: Fix overreads mpegts: rename payload_index to payload_size segment: introduce segmented chain muxer lavu: add AVERROR_BUG error value avplay: clear pkt_temp when pkt is freed. qcelpdec: K&R formatting cosmetics qcelpdec: cosmetics: drop some pointless parentheses x86: conditionally compile dnxhd encoder optimizations Revert "h264: skip start code search if the size of the nal unit is known" swscale: fix formatting and indentation of unscaled conversion routines. h264: skip start code search if the size of the nal unit is known cljr: fix buf_size sanity check cljr: Check if width and height are positive integers Conflicts: libavcodec/cljr.c libavcodec/vc1dec.c libavformat/Makefile libavformat/mpegtsenc.c libavformat/segment.c libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: introduce segmented chain muxerLuca Barbato2011-12-191-0/+32
| | | | | | | | It behaves similarly to image2 muxer
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-101-13/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: isom: sort and pretty-print codec_movaudio_tags[] isom: remove pointless comments in codec_movaudio_tags[] isom: remove commented-out tag for vorbis movenc: write 'chan' tag for AC-3 in MOV mov: add support for reading and writing the 'chan' tag audioconvert: add some additional channel and channel layout macros audioconvert: change 7.1 "wide" layout to use side surround channels movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs doc: update documentation to use avconv doc: update demuxers section doc: extend external library coverage doc: split platform specific information doc: port the git-howto to texinfo doc: provide fallback css and customize @float doc: document fate in a texinfo doxy: change hue value to match our green Conflicts: doc/fate.txt doc/ffserver.texi doc/general.texi doc/muxers.texi doc/protocols.texi doc/t2h.init libavformat/isom.c libavformat/mov.c libavutil/avutil.h tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: update documentation to use avconvLuca Barbato2011-12-091-19/+19
| |
* | doc: tiny spelling fixMichael Niedermayer2011-10-271-1/+1
| | | | | | | | | | Found-by & newspelling-by: pasteeater Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: document -moov_sizeMichael Niedermayer2011-10-261-0/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>