* commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e':
vf_framepack: Use av_image_copy() where appropriate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c':
dnxhddec: Enable frame threading
FFmpeg has much more threading modes for DNxHD
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60':
avconv: Make the private options discovery more manifest
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '4885bde3187a2bb0cae85b67796e07db233bf77f':
motion_est_template: Fix undefined left shift of negative number
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '977f41e274a66c9d257186ca1df8373a09cc4d40':
mlpdec: Fix a undefined left shift of negative number
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d':
lavc: Make AVPacket.duration int64, and deprecate convergence_duration
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b':
mips: intreadwrite: Only execute that code for mips r1 or r2
Not merged, as FFmpeg has a separate condition to protect this code.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad':
configure: mips: Support mips r6, r2 and r1
Not merge, as MIPS support in ffmpeg is handled
quite differently and I do not have an env to test.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This correctly adjust chroma subsampling for column interleaved mode,
and allows future high bitdepth support.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This bit is 1 in some samples, and seems to coincide with interlaced
mbs and CID1260. 2008 specs do not know about it, and maintain qscale
is 11 bits. This looks oversized, but may help larger bitdepths.
Currently, it leads to an obviously incorrect qscale value, meaning
its syntax is shifted by 1. However, reading 11 bits also leads to
obviously incorrect decoding: qscale seems to be 10 bits.
However, as most profiles still have 11bits qscale, the feature is
restricted to the CID1260 profile (this flag is dependent on
a higher-level flag located in the header).
The encoder writes 12 bits of syntax, last and first bits always 0,
which is now somewhat inconsistent with the decoder, but ends up with
the same effect (progressive + reserved bit).
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Note that convergence_duration had another meaning, one which was in
practice never used. The only real use for it was a 64 bit replacement
for the duration field. It's better just to make duration 64 bits, and
to get rid of it.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* commit '678f788fea3380e5cbbf75baac5cc0ce07a56a42':
configure: Set the initial ldflags to match the cflags
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '539e5ac2ecfec2e2f441222a43fb0583643ea607':
examples/qsvdec: free the lavc decoder before closing MFX/VAAPI
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '3ee462dca1038e63b8e8d5e751121736d5772a5d':
examples/qsvdec: do not free the surfaces in the frame_free() callback
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc':
qsvenc: do not try to close the encoder if the session is NULL
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482':
lavfi: do not exclude hwaccel formats from ff_all_formats()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
MIPS R6 supports unaligned memory access and does not have
the load/store-left/right family of instructions.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Some gcc-based toolchain would fail to link if the abi set by the
cpuflags does not match the default.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
File libopenh264enc.c has been modified so that the encoder uses av_log()
to log messages (error, warning, info, etc.) instead of logging them
directly to stderr. At the time the encoder is created, the current
libav log level is mapped to an equivalent libopenh264 log level. This
log level, and a message logging function that invokes av_log() to
actually log messages, are then set on the encoder.
This contains further changes and simplifications by Michael Niedermayer
and Martin Storsjö.
Signed-off-by: Martin Storsjö <martin@martin.st>
pix_fmt was declared presumably to shorten the argument passed to the function.
However, it is currently not being used for such a purpose.
This patch simply removes it instead.
This fixes -Wunused-but-set-variable reported at e.g:
http://fate.ffmpeg.org/log.cgi?time=20150919194249&log=compile&slot=x86_64-darwin-gcc-4.9.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
In case of resync, always free the packet, but retry only if the resync
did not get to the end of the file. Otherwise, there is a memory leak when the
last packet in the file is corrupted.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes
Ganesh Ajjanagadde
Vittorio Giovara
Christophe Gisquet
Thierry Foucu
wm4
Michael Niedermayer
Vicente Olivert Riera
Luca Barbato
Gregory J. Wolfe