aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
Commit message (Collapse)AuthorAgeFilesLines
* lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to ↵Stefano Sabatini2011-09-061-1/+1
| | | | | | | | buffersink.h This is done in order to clarify the non-video-specific nature of the buffersink code, as the result of the video/audio API unification of the previous commit, and for improving overall consistency.
* lavfi: unify asink_buffer and vsink_buffer APIStefano Sabatini2011-09-061-1/+9
| | | | | | | | | The new API is more generic (no distinction between audio/video for pulling frames), and avoids code duplication. A backward compatibility layer is kept for avoiding tools ABI breaks (only for the video binary interface, audio interface was never used in the tools).
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-212/+225
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling() ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled. wavpack: fix wrong return value in wavpack_decode_block() avconv: fix parsing metadata specifiers. fate: use +frame+slice named constants instead of '3' mpeg12: propagate more real return values through chunk decode error return and fix some indentation wavpack: use context reset in appropriate places avconv: move mux_preload and mux_max_delay to options context avconv: move bitstream filters to options context. avconv: move rate_emu to options context. avconv: move max_frames to options context. avconv: move metadata to options context. avconv: move ts scale to options context. avconv: move chapter maps to options context. avconv: move metadata maps to options context. avconv: move codec_names to options context. Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix parsing metadata specifiers.Anton Khirnov2011-09-051-1/+1
| | | | | | | | | | | | After 039267f192f335144d9251e6f05a1513dd1e8ef1, metadata specifiers are passed without the leading ':'. Remove a ++ that didn't take this into account.
| * avconv: move mux_preload and mux_max_delay to options contextAnton Khirnov2011-09-051-8/+9
| |
| * avconv: move bitstream filters to options context.Anton Khirnov2011-09-051-37/+22
| | | | | | | | | | Change syntax -- -[vas]bsf are replaced by -bsf:[stream specifier], the argument is now a comma-separated list of bitstream filters.
| * avconv: move rate_emu to options context.Anton Khirnov2011-09-051-8/+12
| | | | | | | | Make it work properly with multiple input files.
| * avconv: move max_frames to options context.Anton Khirnov2011-09-051-8/+32
| | | | | | | | | | Add a -frames option that uses generic stream specifiers, change -[vad]frames into aliases to it.
| * avconv: move metadata to options context.Anton Khirnov2011-09-051-24/+48
| | | | | | | | It is now possible to set metadata on streams and chapters.
| * avconv: move ts scale to options context.Anton Khirnov2011-09-051-28/+12
| |
| * avconv: move chapter maps to options context.Anton Khirnov2011-09-051-11/+11
| |
| * avconv: move metadata maps to options context.Anton Khirnov2011-09-051-31/+25
| |
| * avconv: move codec_names to options context.Anton Khirnov2011-09-051-63/+59
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-113/+103
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: fix type for thread_type option avconv: move format to options context avconv: move limit_filesize to options context avconv: move start_time, recording_time and input_ts_offset to options context avconv: add a context for options. cmdutils: allow storing per-stream/chapter/.... options in a generic way cmdutils: split per-option code out of parse_options(). cmdutils: add support for caller-provided option context. cmdutils: declare only one pointer type in OptionDef cmdutils: move grow_array() from avconv to cmdutils. cmdutils: move exit_program() declaration to cmdutils from avconv http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes nutenc: add namespace to the api facing functions Conflicts: avconv.c cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffprobe.c ffserver.c libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: move format to options contextAnton Khirnov2011-09-041-22/+14
| |
| * avconv: move limit_filesize to options contextAnton Khirnov2011-09-041-4/+4
| |
| * avconv: move start_time, recording_time and input_ts_offset to options contextAnton Khirnov2011-09-041-41/+27
| |
| * avconv: add a context for options.Anton Khirnov2011-09-041-23/+56
| | | | | | | | | | | | Move stream maps to it. Eventually all non-global options should be stored in it.
| * cmdutils: add support for caller-provided option context.Anton Khirnov2011-09-041-2/+2
| | | | | | | | This is the first step to removing the globals plague from avtools.
| * cmdutils: move grow_array() from avconv to cmdutils.Anton Khirnov2011-09-041-20/+0
| |
| * cmdutils: move exit_program() declaration to cmdutils from avconvAnton Khirnov2011-09-041-3/+3
| | | | | | | | Allows cmdutils to call each tool's own cleanup function.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-041-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: AVOptions: fix av_set_string3() doxy to match reality. cmdutils: get rid of dummy contexts for examining AVOptions. lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions. AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find(). cpu detection: avoid a signed overflow Conflicts: avconv.c cmdutils.c doc/APIchanges ffmpeg.c libavcodec/options.c libavcodec/version.h libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: get rid of dummy contexts for examining AVOptions.Anton Khirnov2011-09-031-3/+7
| | | | | | | | Replace it with newly introduced libavutil API.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-3/+3
|\| | | | | | | | | | | | | | | | | | | * qatar/master: avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660 libmp3lame: fix typo AVOptions: drop av_ prefix from static av_get_number(). libx264: use X264_THREADS_AUTO constant instead of 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660Michael Niedermayer2011-09-011-3/+3
| | | | | | | | | | | | | | | | | | These caused scrambled error messages to be printed and floating point exceptions. For example when there was no decoder available for a stream. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-18/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) libx264: set default thread count to 0 (auto) lavc: cosmetics, group deprecated codec flags mpeg12: add 'scan_offset' private option. h263/p encoder: add 'structured_slices' private option. h263/p encoder: add 'obmc' private option. h263p encoder: add 'aiv' private option. h263p encoder: add 'umv' private option. mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. mjpegdec: add 'extern_huff' private option. mpeg4enc: add 'data_partitioning' private option. snow: add 'memc_only' private option. libx264: add 'mbtree' private option. libx264: add 'psy' private option. libmp3lame: add 'reservoir' private option. mpeg2enc: add 'non_linear_quant' private option mpeg12enc: add drop_frame_timecode private option. mpeg12enc: add intra_vlc private option. VC1: Support dynamic dimension changes mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested lavc: deprecate CODEC_FLAG2_BRDO ... Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/libx264.c libavcodec/mjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.h libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove -threads option.Anton Khirnov2011-08-301-18/+0
| | | | | | | | It's only shadowing the AVOption with the same name.
* | Merge commit 'f593628e5868e52a46de666767896c6afcebdae4'Michael Niedermayer2011-08-311-5/+3
|\| | | | | | | | | | | | | | | * commit 'f593628e5868e52a46de666767896c6afcebdae4': avconv: Replace raw picture frame swapping hack. RV40: reuse some H.264 motion compensation functions in RV40. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Replace raw picture frame swapping hack.Alex Converse2011-08-301-5/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-291-25/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "h264: Properly set coded_{width, height} when parsing H.264." isom: add missing AVC-Intra tags, rearrange list and update comments avconv: remove stubs of crop* and pad* options avconv: re-add nb_streams to InputFile. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove stubs of crop* and pad* optionsAnton Khirnov2011-08-291-20/+0
| |
| * avconv: re-add nb_streams to InputFile.Anton Khirnov2011-08-291-5/+8
| | | | | | | | | | | | | | | | It was mistakenly removed in 2cf8355f98681bdd726b739008acd5483f82f8d7, not taking into account that new streams might appear in av_read_frame() that avconv doesn't know about. Fixes bug 24.
| * doxygen: fix wrong comment syntax, //< vs. ///<Diego Biurrun2011-08-261-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-241-6/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Replace goto redo on decode fail with continue. avconv: Remove dead store. libx264: add 'crf_max' private option. libx264: add 'weightp' private option. libx264: add 'rc_lookahead' private option. libx264: add 'psy_trellis' private option. libx264: add 'psy_rd' private option. libx264: add 'aq_strength' private option. libx264: add 'aq_mode' private option. libx264: add 'cqp' private option. libx264: add 'crf' private option. lavc: remove vbv_delay option lavf utils: Fix bad indentation. avconv: use av_clip_int16 for audio clipping Conflicts: libavcodec/libx264.c libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Replace goto redo on decode fail with continue.Alex Converse2011-08-241-2/+1
| | | | | | | | | | This checks for sigterm but otherwise is identical to the previous behavior.
| * avconv: Remove dead store.Alex Converse2011-08-241-1/+0
| |
| * avconv: use av_clip_int16 for audio clippingAlex Converse2011-08-231-3/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-231-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: print the codecs names in the stream mapping. avconv: move the avcodec_find_decoder() call to add_input_streams(). Windows Media Image decoder (WMVP/WVP2) ac3enc: remove outdated TODO comment for apply_channel_coupling() Conflicts: Changelog libavcodec/avcodec.h libavcodec/vc1dec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: print the codecs names in the stream mapping.Nicolas George2011-08-231-0/+4
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avconv: move the avcodec_find_decoder() call to add_input_streams().Anton Khirnov2011-08-231-2/+2
| | | | | | | | | | | | This makes the code simpler to understand, though it results in an unnecessary call to avcodec_find_decoder() if the stream won't be decoded.
* | Fix compilation with --disable-avfilter.Carl Eugen Hoyos2011-08-231-0/+1
| | | | | | | | Fixes ticket #414.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-211-27/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: WavPack demuxer: do not rely on index when timestamp is not in indexed range. WavPack demuxer: store position of the first block in index. WavPack decoder: implement flush function avconv: Separate initialization from the main transcode loop. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Separate initialization from the main transcode loop.Alex Converse2011-08-191-25/+37
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-201-13/+13
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc/avconv: replace forgotten av by avconv. avconv: reset input_ts_offset between files. doc/avconv: extend -ss documentation. avconv: call flush_encoders() from transcode() directly. avconv: fix broken indentation. avconv: rescue poor abused limit_filesize global. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: reset input_ts_offset between files.Anton Khirnov2011-08-191-0/+1
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: call flush_encoders() from transcode() directly.Anton Khirnov2011-08-191-6/+3
| | | | | | | | | | | | And remove now pointless parameter. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: fix broken indentation.Anton Khirnov2011-08-191-1/+1
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: rescue poor abused limit_filesize global.Anton Khirnov2011-08-191-6/+8
| | | | | | | | | | | | | | Keep a per-OutputFile instance of it, thus making -fs work with multiple output files. Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-191-3/+9
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Set error code before before jumping to fail. h264: fix PCM intra-coded blocks in monochrome case Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Set error code before before jumping to fail.Alex Converse2011-08-191-3/+9
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 07:22:50 +0000