mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
d2084402e6
* 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> |
||
---|---|---|
.. | ||
fate | ||
ref | ||
audiogen.c | ||
base64.c | ||
codec-regression.sh | ||
copycooker.sh | ||
fate2.mak | ||
fate-run.sh | ||
fate-update.sh | ||
fate.mak | ||
fate.sh | ||
ffserver-regression.sh | ||
ffserver.conf | ||
ffserver.regression.ref | ||
lavf-regression.sh | ||
lavfi-regression.sh | ||
lena.pnm | ||
Makefile | ||
md5.sh | ||
regression-funcs.sh | ||
rotozoom.c | ||
tiny_psnr.c | ||
videogen.c |