aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | ffmpeg: replace messy duplicated tag compatibility functions by more generic ↵Michael Niedermayer2011-09-111-18/+3
| | | | | | | | | | | | solution. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add vbsf & absf for compatibility.Michael Niedermayer2011-09-111-0/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-101-93/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. avconv: move audio_channels to the options context. avconv: move *_disable to options context. avconv: remove -[vas]lang options. avconv: move codec tags to options context. cljr: init_get_bits size in bits instead of bytes indeo2: fail if input buffer too small indeo2: init_get_bits size in bits instead of bytes ffv1: Fixed size given to init_get_bits() in decoder. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix -reMichael Niedermayer2011-09-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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).
* | ffmpeg: map subtitle stream by default when user specified -scodecMichael Niedermayer2011-09-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-267/+276
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: tell reset_options() if it is used on input or output files.Michael Niedermayer2011-09-051-5/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-115/+106
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * 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-73/+73
| | | | | | | | 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.
* | ffmpeg: fix reading from stdin on windowsMichael Niedermayer2011-09-041-1/+27
| | | | | | | | | | Based on code by Rolf Siegrist Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "ffmpeg: remove presets." and reimplement the needed parts that no ↵Michael Niedermayer2011-09-031-0/+55
| | | | | | | | | | | | | | | | longer exist. Needed by libvpx This reverts commit a0147957e70aecd9d3e06f69a53d26456f061fc9.
* | ffmpeg: Fix minor memleak of input_tmpChiranjeevi Melam2011-09-021-1/+4
| |
* | ffmpeg: fix two unused variables warnings.Clément Bœsch2011-09-011-6/+6
| |
* | Fix compilation with --disable-avfilter.Carl Eugen Hoyos2011-09-011-1/+4
| | | | | | | | Fixes ticket #425.
* | ffmpeg: Fix typos introduced in:Michael Niedermayer2011-09-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660 Author: Anton Khirnov <anton@khirnov.net> Date: Wed Jul 6 08:49:07 2011 +0200 avconv: factor out initializing input streams. 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: Michael Niedermayer <michaelni@gmx.at>
* | 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>
| * doxygen: fix wrong comment syntax, //< vs. ///<Diego Biurrun2011-08-261-3/+3
| |
* | ffmpeg: ffmpeg: fix reading commands from the keyboardMichael Niedermayer2011-08-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix reading commands from stdinMichael Niedermayer2011-08-301-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: re-add nb_streams to InputFile.Anton Khirnov2011-08-301-5/+6
| | | | | | | | | | | | | | | | 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.
* | ffmpeg: Replace goto redo on decode fail with continue.Alex Converse2011-08-301-2/+1
| | | | | | | | | | This checks for sigterm but otherwise is identical to the previous behavior.
* | ffmpeg: Remove dead store.Alex Converse2011-08-301-1/+0
| |
* | ffmpeg: use av_clip_int16 for audio clippingAlex Converse2011-08-301-3/+1
| |
* | ffmpeg: switch stream mapping print code to qatars variantMichael Niedermayer2011-08-301-6/+5
| | | | | | | | | | Author of the lines of code is probably Nicolas and or Anton Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move the avcodec_find_decoder() call to add_input_streams().Anton Khirnov2011-08-301-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.
* | ffmpeg: Separate initialization from the main transcode loop.Alex Converse2011-08-301-26/+38
| |
* | ffmpeg: reset input_ts_offset between files.Anton Khirnov2011-08-301-0/+1
| | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: call flush_encoders() from transcode() directly.Anton Khirnov2011-08-301-6/+3
| | | | | | | | | | | | | | And remove now pointless parameter. Signed-off-by: Alex Converse <alex.converse@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix broken indentation.Anton Khirnov2011-08-301-1/+1
| | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: rescue poor abused limit_filesize global.Anton Khirnov2011-08-301-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>
* | ffmpeg: Set error code before before jumping to fail.Alex Converse2011-08-301-3/+9
| |
* | ffmpeg: Fix spelling errors.Alex Converse2011-08-301-3/+3
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | ffmpeg: save two levels of indentation in flush_encoders()Anton Khirnov2011-08-301-69/+67
| | | | | | | | | | | | | | | | | | | | | | By replacing if (foo) <do stuff> with if (!foo) continue; <do stuff>
* | ffmpeg: factor flushing encoders out of output_packet().Anton Khirnov2011-08-301-81/+88
| |
* | ffmpeg: factor out initializing input streams.Anton Khirnov2011-08-301-34/+35
| |
* | ffmpeg: reset streamid_map between output files.Anton Khirnov2011-08-301-1/+2
| |
* | ffmpeg: make timer_start a local var in transcode().Anton Khirnov2011-08-301-5/+4
| |
* | ffmpeg: cosmetics, move OutputStream.Anton Khirnov2011-08-301-26/+25
| | | | | | | | Allows us to get rid of forward InputStream declaration.
* | ffmpeg: remove two unused macros.Anton Khirnov2011-08-301-5/+0
| |
* | ffmpeg: reindent.Anton Khirnov2011-08-301-112/+111
| |
* | ffmpeg: rescue poor abused start_time global.Anton Khirnov2011-08-301-5/+11
| | | | | | | | | | Keep a per-OutputFile instance of it, thus making -ss work with multiple output files.
* | ffmpeg: : rescue poor abused recording_time global.Anton Khirnov2011-08-301-9/+12
| | | | | | | | | | Keep a per-OutputFile instance of it, thus making -t work with multiple output files.
* | ffmpeg: fix broken indentation.Anton Khirnov2011-08-301-2/+3
| |
* | ffmpeg: get rid of the arbitrary MAX_FILES limit.Anton Khirnov2011-08-301-6/+7
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 09:19:08 +0000