summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-251-7/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ppc: fix some pointer to integer casts ppc: fix 32-bit PIC build vmdaudio: fix decoding of 16-bit audio format. lavf: do not set codec_tag for rawvideo h264: check for out of bounds reads in ff_h264_decode_extradata(). flvdec: Check for overflow before allocating arrays avconv: use correct output stream index when checking max_frames avconv: remove fake coded_frame on streamcopy hack Conflicts: avconv.c libavcodec/h264.c libavcodec/ppc/asm.S libavcodec/vmdav.c libavformat/flvdec.c libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."Anton Khirnov2011-09-211-3/+5
| | | | | | | | | | | | | | This reverts commit 2cf8355f98681bdd726b739008acd5483f82f8d7. AVInputStream.nb_streams tracks number of streams found at the beginning, new streams may appear that ffmpeg doesn't know about. Fixes crash in this case.
* | ffmpeg: improve feedback when processing filtergraph eventsStefano Sabatini2011-09-251-3/+8
| |
* | ffmpeg: apply misc cosmetics fixes in the filtergraph event processing codeStefano Sabatini2011-09-251-16/+17
| | | | | | | | | | In particular provides more consistent and expressive names, supposedly improves readability and user feedback.
* | ffmpeg: increase bit_buffer_size, the header size is clearly too small for ↵Michael Niedermayer2011-09-251-2/+2
| | | | | | | | | | | | rgb48 raw based formats Signed-off-by: Michael Niedermayer <[email protected]>
* | Add libswresample.Michael Niedermayer2011-09-191-54/+29
| | | | | | | | | | | | | | | | | | Similar to libswscale this does resampling and format convertion, just for audio instead of video. changing sampling rate, sample formats, channel layouts and sample packing all in one with a very simple public interface. Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix video synchronization code to be exact on constant fps videos. ↵Michael Niedermayer2011-09-131-1/+10
| | | | | | | | | | | | Fixes Ticket137 Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: remove unused data_codec_name.Clément Bœsch2011-09-121-2/+0
| |
* | ffmpeg: set {audio,video,subtitle}_codec_name const.Clément Bœsch2011-09-121-6/+6
| | | | | | | | | | This fixes "assignment discards ‘const’ qualifier from pointer target type." warnings.
* | ffmpeg: a bit more consistent prototypes.Clément Bœsch2011-09-121-20/+17
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-337/+229
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) audioconvert: add explanatory comments to channel_names array audioconvert: K&R whitespace cosmetics avconv: use correct index when selecting metadata to write to. avconv: fix inverted variable doc/avconv: document option types (input/output/per-stream/...) doc/avtools-common-opts: write a section about stream specifiers. doc/avconv: remove two pointless paragraphs. doc/avconv: document that global options should be specified first. doc/avconv: remove entries for nonexistent options doc/avconv: remove documentation for removed 'timestamp' option doc: cosmetics, rename fftools-common-opts to avtools-.... avconv: move streamid_map to options context. avconv: extend -vf syntax avconv: move top_field_first to options context. avconv: move inter/intra matrix to options context. avconv: remove -psnr option. avconv: remove me_threshold option. avconv: move video_rc_override_string to options context. avconv: move frame pixel format to the options context. avconv: move frame aspect ratio to the options context. ... Conflicts: avconv.c cmdutils_common_opts.h doc/avconv.texi Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: dont copy duration when -t is usedMichael Niedermayer2011-09-111-1/+4
| | | | | | | | | | | | Fixes Ticket445 Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: replace messy duplicated tag compatibility functions by more generic ↵Michael Niedermayer2011-09-111-18/+3
| | | | | | | | | | | | solution. Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: add vbsf & absf for compatibility.Michael Niedermayer2011-09-111-0/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | ffmpeg: fix -reMichael Niedermayer2011-09-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
* | ffmpeg: tell reset_options() if it is used on input or output files.Michael Niedermayer2011-09-051-5/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
| * 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 <[email protected]>
| * 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 <[email protected]>
* | 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 <[email protected]> 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 <[email protected]>
* | 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 <[email protected]>
| * 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 <[email protected]>
* | ffmpeg: fix reading commands from stdinMichael Niedermayer2011-08-301-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: call flush_encoders() from transcode() directly.Anton Khirnov2011-08-301-6/+3
| | | | | | | | | | | | | | And remove now pointless parameter. Signed-off-by: Alex Converse <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix broken indentation.Anton Khirnov2011-08-301-1/+1
| | | | | | | | | | Signed-off-by: Alex Converse <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 04:35:46 +0000