Alex Converse
cb13438543
ffmpeg: Set error code before before jumping to fail.
13 years ago
Alex Converse
6e6ccf0d56
ffmpeg: Fix spelling errors.
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years ago
Anton Khirnov
47a3439ee7
ffmpeg: save two levels of indentation in flush_encoders()
...
By replacing
if (foo)
<do stuff>
with
if (!foo)
continue;
<do stuff>
13 years ago
Anton Khirnov
a16f1afb11
ffmpeg: factor flushing encoders out of output_packet().
13 years ago
Anton Khirnov
94adca68f8
ffmpeg: factor out initializing input streams.
13 years ago
Anton Khirnov
8b85b9fa42
ffmpeg: reset streamid_map between output files.
13 years ago
Anton Khirnov
6bdd9fbc89
ffmpeg: make timer_start a local var in transcode().
13 years ago
Anton Khirnov
3a7b4ccd1c
ffmpeg: cosmetics, move OutputStream.
...
Allows us to get rid of forward InputStream declaration.
13 years ago
Anton Khirnov
8f9c77e765
ffmpeg: remove two unused macros.
13 years ago
Anton Khirnov
e0aee84084
ffmpeg: reindent.
13 years ago
Anton Khirnov
d4d5a95055
ffmpeg: rescue poor abused start_time global.
...
Keep a per-OutputFile instance of it, thus making -ss work with multiple
output files.
13 years ago
Anton Khirnov
08890d355e
ffmpeg: : rescue poor abused recording_time global.
...
Keep a per-OutputFile instance of it, thus making -t work with multiple
output files.
13 years ago
Anton Khirnov
5c2a4d3bb1
ffmpeg: fix broken indentation.
13 years ago
Anton Khirnov
dd0724288e
ffmpeg: get rid of the arbitrary MAX_FILES limit.
13 years ago
Anton Khirnov
76e4873319
ffmpeg: get rid of the output_streams_for_file vs. ost_table schizophrenia
...
Instead store output streams in the same way as input streams.
13 years ago
Michael Niedermayer
b091de2285
Revert "Fix stream mapping regression"
...
Subsequent cherry picks are based on code prior to this, thus this needs to be rebased
on HEAD by a volunteer.
This reverts commit b25d931a82
.
13 years ago
Anton Khirnov
61b933f554
ffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into it
13 years ago
Anton Khirnov
0ea58d7115
ffmpeg: make itsscale syntax consistent with other options.
...
Move the stream specifier to the option name.
13 years ago
Anton Khirnov
81e4655566
ffmpeg: factor out adding input streams.
13 years ago
Alex Converse
a6d0340ca1
ffmpeg: Factorize combining auto vsync with format.
13 years ago
Alex Converse
ebf94f439e
ffmpeg: Factorize video resampling.
13 years ago
Alex Converse
dadbebbbbc
ffmpeg: Don't unnecessarily convert ipts to a double.
13 years ago
Anton Khirnov
7357f6e678
ffmpeg: don't segfault on 0 input files.
13 years ago
Anton Khirnov
6e675b504a
ffmpeg: remove pointless parameter from new_*_stream().
...
New streams are always added to the last output file.
13 years ago
Anton Khirnov
868013aa01
ffmpeg: cosmetics, move code
...
Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.
13 years ago
Anton Khirnov
6f610fa144
ffmpeg: cosmetics -- move copy_chapters().
...
It's only used in opt_output_file(), so move it right above
opt_output_file().
13 years ago
Anton Khirnov
c692eda3e7
ffmpeg: cosmetics -- move parse_forced_key_frames().
...
parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().
13 years ago
Anton Khirnov
f69e8c7d15
ffmpeg: switch to a:b syntax
13 years ago
Anton Khirnov
e3bf4e292c
ffmpeg: replace -vcodec/-acodec/-scodec with a better system.
...
The new option doesn't depend on its placement wrt -new* options (which
don't exist anymore) and works in a similar way as per-stream AVOptions.
-[vas]codec remain as aliases to -codec:[vas]
13 years ago
Anton Khirnov
a0147957e7
ffmpeg: remove presets.
...
Nothing except x264 uses them and native x264 presets should be used
with private options.
13 years ago
Michael Niedermayer
2d726b195e
Revert "ffmpeg: simplify opt_*_codec() options"
...
This is needed because the following cherry picks are based on code prior of this
This reverts commit f712f6c8a4
.
13 years ago
Anton Khirnov
88bfe4518b
ffmpeg: change semantics of -map
...
New syntax contains an optional stream type, allowing to refer to n-th
stream of specific type.
Omitting stream number now maps all streams of the given type.
13 years ago
Anton Khirnov
f12f40b31a
ffmpeg: get rid of new* options.
...
They are confusing, irregular and redundant -- -map already contains all
the information. Stream maps can now be parsed in opt_output_file().
Add a more user-friendly default behavior in case no maps are present.
Breaks -programid for now, but it never worked properly anyway. A better
solution will be written soon.
13 years ago
Anton Khirnov
7efec8dd6d
ffmpeg: rename sameq variables to same_quant
13 years ago
Anton Khirnov
5a9e42ec45
ffmpeg: make -map_metadata work consistently with the other options
...
Before, it took an input and output file index, now it only takes an
input file and applies to the next output file.
Stream/chapter/program specification is now part of the option name and
the delimiter was changed from ',' to ':' to be consistent with the
similar feature for AVOptions.
13 years ago
Anton Khirnov
6bf3c39d17
ffmpeg: make -map_chapters accept only the input file index.
...
This is consistent with how all the other options work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
97861f5b08
ffmpeg: Set codec_type in new_output_stream
...
Ported from a change from anton khirnov to avconv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
a0ce297b69
ffmpeg: rename ffmpeg_exit in exit_program
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
50be0b911a
ffmpeg: Support queing filter commands for later times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
bb22f39fe2
ffmpeg: Support passing commands to filters at runtime
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Diego Biurrun
0249478756
doxygen: fix wrong comment syntax, //< vs. ///<
13 years ago
Nicolas George
83ff2a1153
ffmpeg: use avcodec_get_name to report missing en/decoders.
13 years ago
Nicolas George
8b52b46c97
ffmpeg: print the codecs names in the stream mapping.
13 years ago
Nicolas George
5fa98ab42d
ffmpeg: ignore forward gaps for subtitles streams.
13 years ago
Diego Biurrun
f056fc2c6c
ffmpeg: remove unsed variable nopts
13 years ago
Dustin Brody
2bfdb34c8a
mpeg12: remove repeat-field code disabled since May 2002
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
13 years ago
Michael Niedermayer
f8a1fc2623
ffmpeg: fix null pointer segfault on solaris. (ticket381)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
d4863fc1a8
cmdutils: allow precisely specifying a stream for AVOptions.
13 years ago
Anton Khirnov
791a86c37a
ffmpeg: add a warning stating that the program is deprecated.
13 years ago
Anton Khirnov
4d58e4cb4c
Rename ffserver to avserver.
13 years ago