* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
error_resilience: move the MECmpContext initialization into ER code
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a':
hevc: store the short term rps flag and size in the context
See: 06894f1a04
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '36779a84051eae6744cc936d91b1d428143665ba':
hevc: store the escaped/raw bitstream in HEVCNAL
See: 2af82a1ad9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2':
hevc: pass the full HEVCNAL struct to decode_nal_unit
Conflicts:
libavcodec/hevc.c
See: 77140279d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
examples/transcode_aac: generate proper PTS and set the muxer timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
examples/transcode_aac: properly select the output sample format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
hevc: unref the current frame if frame_start() fails
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.
this makes the static libraries binary reproducible
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
this makes the static libraries binary reproducible
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This should behave similar to x264 and other encoders, as it handles a
gop_size of 0 as Intra-Only, while it's still possible to control how
many B-Frames it inserts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rdp/dshow_tv_tuner:
dshow: tweak logging
dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
dshow: alert as to ramifications of switching crossbar routing
dshow: add properties dialog for tv tuners
Merged-by: Michael Niedermayer <michaelni@gmx.at>
The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.
Michael Niedermayer
Hendrik Leppkes
Stefano Sabatini
Anton Khirnov
Andreas Unterweger
Andreas Cadhalpun
Kevin Wheatley
James Almer
Timo Rothenpieler
Paul B Mahol
Carl Eugen Hoyos