The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.
With the new parser the string:
1234
is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.
ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.
The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.
Not sure this is the correct solution but that can be investigated too once
the docs build again
Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This makes sure that pointers from av_strdup are reallocable,
which is used in av_dict_set if the AV_DICT_APPEND flag is set.
Nothing should rely on pointers from av_strdup being aligned.
Signed-off-by: Martin Storsjö <martin@martin.st>
* commit '95587859cc69e5abe37c9e3af48008032d98e262':
mpegvideo: Move obmc in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
ffv1: Assume bitdepth 0 means 8bit
Conflicts:
libavcodec/ffv1dec.c
Note, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '68edd5be0980941924ae633d98589d56a8091bbd':
FATE: use proper comparison mode in the lavr tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
bitstream: Check the result of av_malloc()
Conflicts:
libavcodec/bitstream.c
See: aa74810fc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c0085f94fea89b180e5727b193484a83586d3490':
mpegaudio_tablegen: Don't use llrint
cos_tablegen: Don't use lrint
tablegen: Don't use cbrtf in host tools
tableprint: Fix use of a size_t print with MSVC
Conflicts:
libavcodec/cbrt_tablegen.h
libavcodec/mpegaudio_tablegen.h
See: e516921143
See: 5086720993
See: 008014b5e7
See: 00aa24ffee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
The tests are disabled as 2 do not pass yet
(fate-hevc-conformance-PPS_A_qualcomm_7 and fate-hevc-conformance-RAP_A_docomo_4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini
Michael Niedermayer
Diego Biurrun
Dirk Farin
Carl Eugen Hoyos
Mickaël Raulet
Paul B Mahol
Timothy Gu
Martin Storsjö
Ronald S. Bultje
Guillaume Martres
Yusuke Nakamura
gcocherel
Luca Barbato