* cehoyos/master:
Fix codec fps diplay for very small fps.
lavf/mpeg: Support alaw in Hikvision CCTV recordings.
lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ER with slice threads is buggy and since the merge of the libav cleanup broken
as the ER context which is supposed to be per frame has been placed in
the slice context, so there are multiple per frame which does not work as is.
Theres no bug report about ER with frame threads. If someone knows of a
case where it crashes / fails without slice threads please mail me and
open a ticket on trac.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
avconv: do not overwrite the stream codec context for streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'df528b11ac607de13a7c438f2a51f2119f71a03c':
hevc: make sure no dangling pointers remain around on VPS/SPS change
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
hevc: do not change the VPS if its contents are the same
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Otherwise it is shown even after the file was fixed with avidemux,
because the userdata string still ends with 'p'.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This improves the last frames duration with CFR and when the input durations
are inaccurate or missing
Fixes Ticket4119
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
I found another MXF File containing ProRes with the following
codec_uls: 060E2B34040101010E04020102110500
Therefor I relaxed the pattern.
Related to issue #4349
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Since we are not doing encoding, there is no point in ever touching the
separate encoding context. Always use the stream codec context.
Fixes writing attachments.
CC:libav-devel@libav.org
Additionally always set the software pixel format, so it's available
even if ff_get_format() is not called later. This will be useful for
exporting stream parameters from init().
Make sure we don't buffer up more than max_delay worth of data
before writing a PES packet, even if pes_payload_size is set to
a larger value.
Signed-off-by: Martin Storsjö <martin@martin.st>
The AVSC_API changes in the new headers mean that the 2.6 alphas
are just as incompatible as 2.5 is.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
In order to safely exit when the user tries to use AviSynth 2.5,
the continue_on_fail value for 2.6's functions need to be set to
1. Otherwise, the library loader fails before the 'upgrade to
2.6' log message appears.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Should fix compilation failures with strict compilers
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
It was not possible to set a profile before, the builtin profile
parameter does not seem to work propperly.
To be compatible with libx264, this overlays it with a local parameter
that expects a string, instead of an int, that takes the well known values
"high", "main" or "baseline".
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer
Lou Logan
Carl Eugen Hoyos
Andreas Cadhalpun
Rong Yan
Himangi Saraogi
Steve Dierker
Anton Khirnov
Martin Storsjö
Mariusz Szczepańczyk
Stephen Hutchinson
Lukasz Marek
James Almer
Donny Yang
Tim Nicholson
Rainer Hochecker
Timo Rothenpieler