| Commit message (Collapse) | Author | Age |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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>
|
| |
| |
| |
| | |
Replace it with newly introduced libavutil API.
|
| |
| |
| |
| |
| | |
Based on code by Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| |
| |
| | |
longer exist.
Needed by libvpx
This reverts commit a0147957e70aecd9d3e06f69a53d26456f061fc9.
|
| | |
|
| | |
|
| |
| |
| |
| | |
Fixes ticket #425.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
* 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>
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| | |
This checks for sigterm but otherwise is identical to the previous
behavior.
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Author of the lines of code is probably Nicolas and or Anton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| |
| | |
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| |
| | |
And remove now pointless parameter.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| | |
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| |
| |
| |
| | |
Keep a per-OutputFile instance of it, thus making -fs work with multiple
output files.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By replacing
if (foo)
<do stuff>
with
if (!foo)
continue;
<do stuff>
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Allows us to get rid of forward InputStream declaration.
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Keep a per-OutputFile instance of it, thus making -ss work with multiple
output files.
|
| |
| |
| |
| |
| | |
Keep a per-OutputFile instance of it, thus making -t work with multiple
output files.
|
| | |
|
| | |
|
| |
| |
| |
| | |
Instead store output streams in the same way as input streams.
|
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| | |
Move the stream specifier to the option name.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
New streams are always added to the last output file.
|
| |
| |
| |
| |
| | |
Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.
|
| |
| |
| |
| |
| | |
It's only used in opt_output_file(), so move it right above
opt_output_file().
|
| |
| |
| |
| |
| | |
parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().
|