| Commit message (Collapse) | Author | Age |
|
|
|
|
| |
The option is mostly useful to make ffprobe output independent from the
build, and in particular to fix FATE --enable-small failures.
|
|
|
|
| |
Fix regression introduced in 749ddc14fc9ebcef09965dfd98c8bf2505dc3b58.
|
|
|
|
|
| |
Allow to skip section name at the begin of each line. Possibly simplify
output.
|
| |
|
| |
|
| |
|
|
|
|
| |
This is for interoperability purpose with the fork.
|
|
|
|
|
| |
Liberally based on the work of Luca Barbato <lu_zero@gentoo.org>, done
for libav/avprobe.
|
| |
|
| |
|
|
|
|
|
|
| |
ffmpeg.org url
Address trac ticket #1265.
|
| |
|
|
|
|
| |
Help simplifying parsing in certain cases.
|
|
|
|
|
|
|
| |
The option is useful for simplifying parsing.
Also use the new option in fate, in order to fix the regression
introduced by the previous commit.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* qatar/master:
libschroedinger: Switch to function names more in line with Libav style.
Move code shared between libdirac and libschroedinger to libschroedinger.
lavfi: uninline avfilter_copy_buffer_ref_props().
lavf: add missing '*' in a doxy.
h264: Remove a commented-out function pointer typedef.
txd: Remove write-only variable in txd_decode_frame().
mmvideo.c: Remove unused variable in mm_decode_pal().
build: cosmetics: Add missing end-of-line backslashes to item lists.
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
libschroedinger: Move a function to avoid a forward declaration.
pthread: warn on high thread counts
vf_yadif: fix missing error handling for avfilter_poll_frame()
avprobe: allow showing only one container/stream property.
lavfi: support audio in avfilter_copy_frame_props().
lavfi: avfilter_merge_formats: handle case where inputs are same
lavc: add sample rate and channel layout to AVFrame.
zerocodec: check if the previous frame is missing
doc: clarify check for NULL pointer style
Conflicts:
doc/APIchanges
doc/developer.texi
ffprobe.c
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/libdirac_libschro.c
libavcodec/libdirac_libschro.h
libavcodec/mmvideo.c
libavcodec/txd.c
libavcodec/version.h
libavcodec/zerocodec.c
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/version.h
libavformat/Makefile
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| |
| |
| |
| | |
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
|
| |
| |
| |
| |
| |
| | |
metadata is already plural.
Found-by: Alexander Strasser
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add -show_frames option to ffprobe.
Partially based on the work of Thomas Kuehnel <kuehnelth@googlemail.com>
for SOCIS 2011.
The wicked idea of creating a special "packets_and_frames" container for
structured formats (JSON and XML) comes from Clément.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
This allows -print_format to accept string of the form WRITER=OPTIONS,
as required by the pending compact writer patch.
|
| |
| |
| |
| | |
Also update documentation related to the output format.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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 <michaelni@gmx.at>
|
| | |
|
| | |
|
| |
| |
| |
| | |
Useful for mimicking the ffmpeg -i FILE syntax.
|
| | |
|
| |
| |
| |
| | |
Muxers are not used by ffprobe.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* qatar/master:
Handle unicode file names on windows
rtp: Rename the open/close functions to alloc/free
Lowercase all ff* program names.
Refer to ff* tools by their lowercase names.
NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg.
Replace `` by $() syntax in shell scripts.
patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled Remove stray libavcore and _g binary references.
vorbis: Rename decoder/encoder files to follow general file naming scheme.
aacenc: Fix whitespace after last commit.
cook: Fix small typo in av_log_ask_for_sample message.
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
Remove RDFT dependency from AAC decoder.
Add some debug log messages to AAC extradata
Fix mov debug (u)int64_t format strings.
bswap: use native types for av_bwap16().
doc: FLV muxing is supported.
applehttp: Handle AES-128 encrypted streams
Add a protocol handler for AES CBC decryption with PKCS7 padding
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set
Conflicts:
ffplay.c
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
| |
This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4.
Conflicts:
doc/optimization.txt
|
|
|
|
| |
unless it stands for ffmpeg the program or is historic
|
|
|
|
|
|
|
|
|
|
|
|
| |
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.
Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.
The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
|
|
|
|
| |
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
|
|
|
|
| |
Originally committed as revision 26282 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk
|