summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-03
| | | | | | | | Replace it with newly introduced libavutil API.
* | ffmpeg: fix reading from stdin on windowsMichael Niedermayer2011-09-04
| | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | longer exist. Needed by libvpx This reverts commit a0147957e70aecd9d3e06f69a53d26456f061fc9.
* | ffmpeg: Fix minor memleak of input_tmpChiranjeevi Melam2011-09-02
| |
* | ffmpeg: fix two unused variables warnings.Clément Bœsch2011-09-01
| |
* | Fix compilation with --disable-avfilter.Carl Eugen Hoyos2011-09-01
| | | | | | | | Fixes ticket #425.
* | ffmpeg: Fix typos introduced in:Michael Niedermayer2011-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-31
|\| | | | | | | | | | | | | | | * 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-26
| |
* | ffmpeg: ffmpeg: fix reading commands from the keyboardMichael Niedermayer2011-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix reading commands from stdinMichael Niedermayer2011-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: re-add nb_streams to InputFile.Anton Khirnov2011-08-30
| | | | | | | | | | | | | | | | 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-30
| | | | | | | | | | This checks for sigterm but otherwise is identical to the previous behavior.
* | ffmpeg: Remove dead store.Alex Converse2011-08-30
| |
* | ffmpeg: use av_clip_int16 for audio clippingAlex Converse2011-08-30
| |
* | ffmpeg: switch stream mapping print code to qatars variantMichael Niedermayer2011-08-30
| | | | | | | | | | 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-30
| | | | | | | | | | | | 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-30
| |
* | ffmpeg: reset input_ts_offset between files.Anton Khirnov2011-08-30
| | | | | | | | | | 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-30
| | | | | | | | | | | | | | 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-30
| | | | | | | | | | 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-30
| | | | | | | | | | | | | | 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-30
| |
* | ffmpeg: Fix spelling errors.Alex Converse2011-08-30
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | ffmpeg: save two levels of indentation in flush_encoders()Anton Khirnov2011-08-30
| | | | | | | | | | | | | | | | | | | | | | By replacing if (foo) <do stuff> with if (!foo) continue; <do stuff>
* | ffmpeg: factor flushing encoders out of output_packet().Anton Khirnov2011-08-30
| |
* | ffmpeg: factor out initializing input streams.Anton Khirnov2011-08-30
| |
* | ffmpeg: reset streamid_map between output files.Anton Khirnov2011-08-30
| |
* | ffmpeg: make timer_start a local var in transcode().Anton Khirnov2011-08-30
| |
* | ffmpeg: cosmetics, move OutputStream.Anton Khirnov2011-08-30
| | | | | | | | Allows us to get rid of forward InputStream declaration.
* | ffmpeg: remove two unused macros.Anton Khirnov2011-08-30
| |
* | ffmpeg: reindent.Anton Khirnov2011-08-30
| |
* | ffmpeg: rescue poor abused start_time global.Anton Khirnov2011-08-30
| | | | | | | | | | 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-30
| | | | | | | | | | Keep a per-OutputFile instance of it, thus making -t work with multiple output files.
* | ffmpeg: fix broken indentation.Anton Khirnov2011-08-30
| |
* | ffmpeg: get rid of the arbitrary MAX_FILES limit.Anton Khirnov2011-08-30
| |
* | ffmpeg: get rid of the output_streams_for_file vs. ost_table schizophreniaAnton Khirnov2011-08-30
| | | | | | | | Instead store output streams in the same way as input streams.
* | Revert "Fix stream mapping regression"Michael Niedermayer2011-08-30
| | | | | | | | | | | | Subsequent cherry picks are based on code prior to this, thus this needs to be rebased on HEAD by a volunteer. This reverts commit b25d931a82c7b95b2f47e6759c9d9be7705d664b.
* | ffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into itAnton Khirnov2011-08-30
| |
* | ffmpeg: make itsscale syntax consistent with other options.Anton Khirnov2011-08-30
| | | | | | | | Move the stream specifier to the option name.
* | ffmpeg: factor out adding input streams.Anton Khirnov2011-08-30
| |
* | ffmpeg: Factorize combining auto vsync with format.Alex Converse2011-08-30
| |
* | ffmpeg: Factorize video resampling.Alex Converse2011-08-30
| |
* | ffmpeg: Don't unnecessarily convert ipts to a double.Alex Converse2011-08-30
| |
* | ffmpeg: don't segfault on 0 input files.Anton Khirnov2011-08-30
| |
* | ffmpeg: remove pointless parameter from new_*_stream().Anton Khirnov2011-08-30
| | | | | | | | New streams are always added to the last output file.
* | ffmpeg: cosmetics, move codeAnton Khirnov2011-08-30
| | | | | | | | | | Move find_codec_or_die(), choose_codec(), new_output_stream() and read_avserver_streams() below transcode() where they belong.
* | ffmpeg: cosmetics -- move copy_chapters().Anton Khirnov2011-08-30
| | | | | | | | | | It's only used in opt_output_file(), so move it right above opt_output_file().
* | ffmpeg: cosmetics -- move parse_forced_key_frames().Anton Khirnov2011-08-30
| | | | | | | | | | parse_forced_key_frames() is only used in new_video_stream(), so move it right above new_video_stream().