Commit f1efaf8371 used parentheses
instead of curly braces in texi syntax, resulting in warnings when
the documentation is generated. Fix that.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This is part of normal operation with some formats. A warning should
indicate that something is wrong, and the documentation for AV_LOG_WARNING
says: "Something somehow does not look correct."
Since this message is most likely useful for debugging only, raise the
log level accordingly.
Plus-one-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg:
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples
Reviewed-by: Andrey Utkin
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49':
configure: Do not explicitly set Oy for msvc/icl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b':
fate: Add Canopus Lossless YUY2 test
Conflicts:
tests/fate/lossless-video.mak
tests/ref/fate/cllc-yuy2-noblock
No change as the change is already in master
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22':
cllc: Use outbuf in RGB and ARGB functions
cllc: Implement YUV support
Conflicts:
libavcodec/cllc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b0ce601c160c87349d093d7e542b5c752754f598':
doc/platform: Add info about ICL
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Because O1 or O2 are required to build libav with msvc/icl, this must be
explicitly set instead of just omitting Oy.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
It is implied by O1 or O2, both of which are required to build libav
with msvc/icl. Silences warnings when targeting x64 with icl.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
WebVTT subtitle tracks have four kinds. Certain downstream muxers
(such as for WebM) need to know which WebVTT kind this is, in order to
specify the codec id of the output track.
A new private input option, "-kind", has been added to the WebVTT
demuxer. It accepts as a value any of "subtitles" (the default),
"captions", "descriptions", and "metadata". The kind option value is
used to assign a value to the stream disposition flag, to which four
new values have been added, corresponding the four WebVTT kinds.
Signed-off-by: Matthew Heaney <matthewjheaney@google.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.
To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.
* qatar/master:
lavf: don't abort if both encoder and muxer aspect ratios are not set
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
matroskaenc: restore compatibility with non referenced AVPacket
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '6dc6598692da3b0ebda2d768681786343f26a4f4':
configure: Simplify an expression with enabled_all.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
