* qatar/master:
libx265: Only set the SAR if it is valid
libx265: Use 16-bit SAR
libx265: Use x265_param_parse to set the SAR
See: 8945dcbb52
See: fcc43e02d3
See: cdd21f1f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This causes us to favor RGB8 over PAL8 when FF_LOSS_COLORQUANT is used
It probably makes sense to reinvestigate the exact scoring of pal8 when
our pal8 support improves to be supperior to rgb8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.
Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cehoyos/master:
Fix a typo in amr.c.
Remove an unneeded include of avassert.h from amr.c.
Do not allow writing invalid wav channel layouts by default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Fixes Ticket3540
The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
fate: correctly set sample rate for mp2 tests
Conflicts:
tests/fate/acodec.mak
tests/lavf-regression.sh
one hunk has been ommited as it breaks fate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '0d671ade99059fd47b155df85c10c35eb6d54878':
doc: Use a 3 columns multitable
Conflicts:
doc/encoders.texi
No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b':
fate: update tests for YVYU422 pixel format
Conflicts:
tests/ref/fate/filter-pixdesc
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip
No change as the fate tests where updated in the merges that changed
the scores
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
swscale: support converting YVYU422 pixel format
Conflicts:
libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '46439e156219d27f059cf687743ba5aacf238b87':
mp2: match twolame default options
Not merged as the change breaks fate, also forcing resampling to specific sample rate
reduces quality, and would be like rescaling every movie to 1080.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
The most interesting parts are initialization in ff_MPV_common_init() and
uninitialization in ff_MPV_common_end().
ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL
checks for Picture.f, because these functions can be called on
uninitialized or partially initialized Pictures.
NULL pointer checks are added to ff_thread_release_buffer() stub function.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer
Derek Buitenhuis
Matt Oliver
Anton Khirnov
Nicolas George
Lukasz Marek
Carl Eugen Hoyos
Anthoine Bourgeois
Thilo Borgmann
wm4
Vittorio Giovara