]>
git.sesse.net Git - ffmpeg/log
Hendrik Leppkes [Sat, 3 Oct 2015 07:32:47 +0000 (09:32 +0200)]
Merge commit '
3f1f6053013d0015e9f115a91a11744807649a07 '
* commit '
3f1f6053013d0015e9f115a91a11744807649a07 ':
configure: address a copy-paste typo
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Michael Niedermayer [Fri, 2 Oct 2015 18:05:06 +0000 (20:05 +0200)]
avformat/flvdec: accept sizes if they are off by 11
This error was produced by rtmproto.c, it is possibly such streams
where dumped, this commit is needed to support them
Fixes: z0e.flv
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
wm4 [Fri, 2 Oct 2015 15:18:06 +0000 (17:18 +0200)]
avcodec/videotoolbox: fix decoding of some h264 bitstreams
This affects Annex B streams (such as demuxed from .ts and others). It
also handles the format change in reinit-large_420_8-to-small_420_8.h264
correctly.
Instead of passing through the extradata, create it on the fly it from
the currently active SPS and PPS. Since reconstructing the PPS and SPS
NALs would be very complicated and verbose, we use the NALs as they
originally appeared in the bitstream.
The code for writing the extradata is somewhat derived from
libavformat/avc.c, but it's small and different enough that sharing it
is not really worth it.
wm4 [Fri, 2 Oct 2015 15:18:00 +0000 (17:18 +0200)]
avcodec/h264: keep SPS and PPS bitstream data
We assume an upper bound of 4096 bytes for each raw SPS/PPS. It's hard
to determine an exact maximum size, but this value was was considered
high enough and safe.
Needed for the following VideotoolBox commit.
Christophe Gisquet [Thu, 1 Oct 2015 20:01:27 +0000 (22:01 +0200)]
dnxhddec: init scantable once permutation is set
Otherwise, the dsp may change without its permuation being applied.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Christophe Gisquet [Thu, 1 Oct 2015 20:01:26 +0000 (22:01 +0200)]
dnxhddec: use dequantization formula from specs
The current one, while correct, does not yield the best possible
results. The specificiations suggest another formula, which results
in quality gains in the decoded output from fate tests. This
justifies changing said formula.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Christophe Gisquet [Wed, 30 Sep 2015 08:14:59 +0000 (10:14 +0200)]
dnxhddec: initialize with mb-aligned dimensions
The coded size is a multiple of the macroblock size, which is 16.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 30 Sep 2015 21:00:14 +0000 (23:00 +0200)]
avfilter/vf_maskedmerge: add SIMD for maskedmerge with 8 bit depth input
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Derek Buitenhuis [Thu, 1 Oct 2015 14:38:15 +0000 (15:38 +0100)]
avcodec: Don't lock during open if the codec has threadsafe init
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Paul B Mahol [Wed, 30 Sep 2015 19:40:54 +0000 (21:40 +0200)]
avfilter/af_rubberband: add process_command()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Christophe Gisquet [Mon, 28 Sep 2015 11:59:23 +0000 (13:59 +0200)]
blockdsp: remove high bitdepth parameter
It is only (mis-)used to set the dsp fucntions clear_block(s). But
these functions always work on 16bits-wide elements, which make
the parameter useless and actually harmful, as it causes all content
on more than 8-bits to not use accelerated functions.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 26 Sep 2015 00:14:15 +0000 (21:14 -0300)]
x86/audio_convert: fix clobbering of xmm registers
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Fri, 2 Oct 2015 01:15:04 +0000 (03:15 +0200)]
lavf/rawdec: Autodetect raw TrueHD streams.
Michael Niedermayer [Thu, 1 Oct 2015 23:59:22 +0000 (01:59 +0200)]
avformat/rtmpproto: Fix 2 more cases of the 2nd packet size being wrong
This should fix RTMP input which was broken by
cbbd906be6150be38dfc14b6bc67dcac8da8aea4
the 40 + 11 case is untested as it did not occur in the testcase
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Thu, 1 Oct 2015 23:21:36 +0000 (01:21 +0200)]
lavfi/mandelbrot: Output RGB0 instead of RGBA.
Paul B Mahol [Thu, 1 Oct 2015 20:30:18 +0000 (22:30 +0200)]
configure: check rubberband version, allow only latest one
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 1 Oct 2015 19:53:13 +0000 (21:53 +0200)]
avfilter/x86/vf_psnr.asm: fix typo
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Thu, 1 Oct 2015 17:58:10 +0000 (19:58 +0200)]
lavf/rawdec: Autodetect raw mlp streams.
Henrik Gramner [Wed, 30 Sep 2015 21:17:41 +0000 (23:17 +0200)]
x86inc: Make cpuflag() and notcpuflag() return 0 or 1
Makes it possible to use them in arithmetic expressions.
Sven Dueking [Thu, 1 Oct 2015 08:07:08 +0000 (09:07 +0100)]
qsvenc.c: use query to catch all kind of setting issues
Reviewed-by: Ivan Uskov <ivan.uskov@nablet.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Thu, 1 Oct 2015 09:48:45 +0000 (11:48 +0200)]
avformat/srtdec: more lenient first line probing
Fixes Ticket #4898
Clément Bœsch [Thu, 1 Oct 2015 09:46:05 +0000 (11:46 +0200)]
avformat/srtdec: fix number check for the first character
Michael Niedermayer [Mon, 28 Sep 2015 00:42:39 +0000 (02:42 +0200)]
avcodec/pngdec: mark previous_picture as done on end of decode_frame_common()
Fixes deadlock with threads
Found-by: Paul B Mahol
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 30 Sep 2015 11:10:48 +0000 (13:10 +0200)]
avcodec/vp8: Do not use num_coeff_partitions in thread/buffer setup
The variable is not a constant and can lead to race conditions
Fixes: repro.webm (not reproducable with FFmpeg alone)
Found-by: Dale Curtis <dalecurtis@google.com>
Tested-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 30 Sep 2015 20:35:31 +0000 (22:35 +0200)]
avfilter/vf_maskedmerge: get rid of MaskedMergeContext from functions that do actual work
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 30 Sep 2015 20:23:26 +0000 (22:23 +0200)]
avfilter/vf_maskedmerge: rewrite and remove some duplicated code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 30 Sep 2015 19:16:29 +0000 (21:16 +0200)]
avcodec/mpeg12dec: Initialize chroma_format to 1
This ensures that chroma format is never set to an invalid value
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
wm4 [Wed, 30 Sep 2015 12:53:35 +0000 (14:53 +0200)]
avcodec/mp3: fix skipping zeros
Commits
43bc5cf9 and
c5371f77 add code for skipping initial zeros in mp3
packets. This code forgot to report to the user that data was skipped at
all.
Since audio codecs allow partial packet decoding, the user application
has to rely on the return value. It will remove the data reported as
consumed by the decoder, and feed it to the decoder again. This resulted
in the mp3 frame after the zero region to be decoded over and over
again, until the zero region was finally skipped by the application.
Fix this by including the amount of skipped bytes to the number of
consumed bytes returned by the decode call.
Fixes trac ticket #4890.
Paul B Mahol [Wed, 30 Sep 2015 11:02:03 +0000 (13:02 +0200)]
avfilter/af_rubberband: flush only if there is something available
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Mon, 28 Sep 2015 03:58:01 +0000 (00:58 -0300)]
x86/hevc_sao: move 10/12bit functions into a separate file
Tested-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Matt Oliver [Wed, 30 Sep 2015 03:41:53 +0000 (13:41 +1000)]
avformat/async: Allow compilation with native threads.
Matt Oliver [Wed, 30 Sep 2015 03:41:33 +0000 (13:41 +1000)]
compat/w32pthreads: Add return values to match the simulated pthread functions.
Shawn Singh [Tue, 29 Sep 2015 21:44:38 +0000 (14:44 -0700)]
libavformat/mov.c: Add parsing for DDTS atom for DTS audio
The DDTS atom is defined in ETSI TS 102 114, v1.4.1, Annex E.
This is useful for DTS-HD formats, some of which cannot be
decoded by dcadec.c or libdcadec.
Signed-off-by: Shawn Singh <shawnsingh@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Christophe Gisquet [Mon, 28 Sep 2015 15:30:55 +0000 (17:30 +0200)]
dnxhddata: deduplicate table
CID 1256 is specified as using the same table for luma and chroma,
which is the same as CID 1235 luma table. This is consistent with
the format supposedly being RGB, although most sequences seem to
actually be YCbCr-encoded.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Stefano Pigozzi [Fri, 21 Aug 2015 06:56:24 +0000 (08:56 +0200)]
videotoolbox: require hardware acceleration
VideoToolbox also implements a software decoder for h264, and will fallback to
using it if the file cannot be decoded on the GPU. In these cases though,
we want the hwaccel to fail so that we can use the libavcodec software decoder
instead of the Apple one.
Signed-off-by: wm4 <nfxjfg@googlemail.com>
Carl Eugen Hoyos [Tue, 29 Sep 2015 19:36:18 +0000 (21:36 +0200)]
lavf/rawenc: Force one stream for hevc and m4v.
Paul B Mahol [Tue, 29 Sep 2015 18:47:21 +0000 (20:47 +0200)]
avfilter/vf_atadenoise: do not use uninitialized data
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ganesh Ajjanagadde [Sat, 19 Sep 2015 15:39:59 +0000 (11:39 -0400)]
avcodec/x86/rnd_template: silence -Wunused-function on --disable-mmx
This silences some of the -Wunused-function warnings when compiled with --disable-mmx, e.g
http://fate.ffmpeg.org/log.cgi?time=
20150919094617 &log=compile&slot=x86_64-archlinux-gcc-disable-mmx.
Header guards are too brittle and ugly for this case.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Przemysław Sobala [Tue, 29 Sep 2015 13:25:07 +0000 (15:25 +0200)]
lavf/img2dec: Fix memory leak
Fixes #4886
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 27 Sep 2015 12:06:54 +0000 (14:06 +0200)]
fate: Add basic license header check
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Vicente Olivert Riera [Tue, 29 Sep 2015 16:28:33 +0000 (17:28 +0100)]
configure: address a copy-paste typo
The correct instruction for mips32r1 is addi.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Hendrik Leppkes [Tue, 29 Sep 2015 13:44:28 +0000 (15:44 +0200)]
Merge commit '
26e8fa3b508eb047e85f4e923fc8e82a1aa656ba '
* commit '
26e8fa3b508eb047e85f4e923fc8e82a1aa656ba ':
tiny_psnr: Use the correct abs() version
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:44:14 +0000 (15:44 +0200)]
Merge commit '
c9943f00cfa2471d1b8a3a9ddc7a21049a71090e '
* commit '
c9943f00cfa2471d1b8a3a9ddc7a21049a71090e ':
vf_framepack: Use av_image_copy() where appropriate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:38:05 +0000 (15:38 +0200)]
Merge commit '
e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c '
* commit '
e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c ':
dnxhddec: Enable frame threading
FFmpeg has much more threading modes for DNxHD
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:36:06 +0000 (15:36 +0200)]
Merge commit '
c49cbecbae5a42f4ca004197b0118cc50aaaca2e '
* commit '
c49cbecbae5a42f4ca004197b0118cc50aaaca2e ':
dnxhddec: Decode and use interlace mb flag
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:31:29 +0000 (15:31 +0200)]
Merge commit '
c5e5e6306223623de8352a3ecd224956aa5beb37 '
* commit '
c5e5e6306223623de8352a3ecd224956aa5beb37 ':
riff: Add support for RV40 codec in AVI
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:30:48 +0000 (15:30 +0200)]
Merge commit '
b5e4f393b6757629281f58c3f3f6d55ca522ab60 '
* commit '
b5e4f393b6757629281f58c3f3f6d55ca522ab60 ':
avconv: Make the private options discovery more manifest
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:29:46 +0000 (15:29 +0200)]
Merge commit '
3973f0f773e0bd212734eccda78aa798f8b20692 '
* commit '
3973f0f773e0bd212734eccda78aa798f8b20692 ':
Revert "avconv_opt: Allow printing private options"
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:27:59 +0000 (15:27 +0200)]
Merge commit '
cf7d2f2d2134c0854edf2db91e7436ac2bc9874f '
* commit '
cf7d2f2d2134c0854edf2db91e7436ac2bc9874f ':
lavc: Simplify checking quant bias option
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:27:42 +0000 (15:27 +0200)]
Merge commit '
84dfc426cea7242099aea9d47121cea65dffd936 '
* commit '
84dfc426cea7242099aea9d47121cea65dffd936 ':
avresample: Remove an unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:26:59 +0000 (15:26 +0200)]
Merge commit '
4885bde3187a2bb0cae85b67796e07db233bf77f '
* commit '
4885bde3187a2bb0cae85b67796e07db233bf77f ':
motion_est_template: Fix undefined left shift of negative number
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:26:13 +0000 (15:26 +0200)]
Merge commit '
977f41e274a66c9d257186ca1df8373a09cc4d40 '
* commit '
977f41e274a66c9d257186ca1df8373a09cc4d40 ':
mlpdec: Fix a undefined left shift of negative number
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 13:14:59 +0000 (15:14 +0200)]
Merge commit '
948f3c19a8bd069768ca411212aaf8c1ed96b10d '
* commit '
948f3c19a8bd069768ca411212aaf8c1ed96b10d ':
lavc: Make AVPacket.duration int64, and deprecate convergence_duration
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Ganesh Ajjanagadde [Sun, 20 Sep 2015 02:18:54 +0000 (22:18 -0400)]
avcodec/apedec: fix undefined left shifts of negative numbers
This fixes -Wshift-negative-value reported with clang 3.7+, e.g
http://fate.ffmpeg.org/log.cgi?time=
20150919172459 &log=compile&slot=x86_64-darwin-clang-polly-notiling-3.7.
Note that the patch crucially depends on int >= 32 bits,
an assumption made in many places in the codebase.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Tue, 29 Sep 2015 12:35:07 +0000 (14:35 +0200)]
Merge commit '
d00bb8addccb63fa3feacb06d2a310731dc0113b '
* 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>
Hendrik Leppkes [Tue, 29 Sep 2015 12:33:35 +0000 (14:33 +0200)]
Merge commit '
1016a75cf3170648dc9b59fdef170cbfc142f8ad '
* 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>
Vittorio Giovara [Tue, 22 Sep 2015 11:56:48 +0000 (13:56 +0200)]
tiny_psnr: Use the correct abs() version
Vittorio Giovara [Tue, 22 Sep 2015 12:22:15 +0000 (14:22 +0200)]
vf_framepack: Use av_image_copy() where appropriate
This correctly adjust chroma subsampling for column interleaved mode,
and allows future high bitdepth support.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Sat, 26 Sep 2015 15:38:23 +0000 (17:38 +0200)]
dnxhddec: Enable frame threading
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Christophe Gisquet [Sat, 26 Sep 2015 15:38:22 +0000 (17:38 +0200)]
dnxhddec: Decode and use interlace mb flag
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>
Thierry Foucu [Sat, 26 Sep 2015 14:21:06 +0000 (16:21 +0200)]
riff: Add support for RV40 codec in AVI
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Vittorio Giovara [Sun, 27 Sep 2015 14:13:01 +0000 (16:13 +0200)]
avconv: Make the private options discovery more manifest
Vittorio Giovara [Sun, 27 Sep 2015 14:13:00 +0000 (16:13 +0200)]
Revert "avconv_opt: Allow printing private options"
This reverts commit
7bb1c1bfd22de2200743af04ebd0c7c775f56f7e .
A long existing version in the form of avconv -h decoder=h264 already
existed, and this just duplicates it.
Vittorio Giovara [Sat, 26 Sep 2015 21:00:57 +0000 (23:00 +0200)]
lavc: Simplify checking quant bias option
Ganesh Ajjanagadde [Sat, 26 Sep 2015 14:24:02 +0000 (16:24 +0200)]
avresample: Remove an unused variable
This fixes a -Wunused-variable warning.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Ganesh Ajjanagadde [Sat, 26 Sep 2015 14:24:01 +0000 (16:24 +0200)]
motion_est_template: Fix undefined left shift of negative number
This fixes a -Wshift-negative-value warning reported with clang 3.7+.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Ganesh Ajjanagadde [Sat, 26 Sep 2015 14:24:00 +0000 (16:24 +0200)]
mlpdec: Fix a undefined left shift of negative number
This fixes a -Wshift-negative-value warning reported with clang 3.7+.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
wm4 [Sat, 26 Sep 2015 16:13:55 +0000 (18:13 +0200)]
lavc: Make AVPacket.duration int64, and deprecate convergence_duration
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>
Hendrik Leppkes [Tue, 29 Sep 2015 12:24:35 +0000 (14:24 +0200)]
Merge commit '
678f788fea3380e5cbbf75baac5cc0ce07a56a42 '
* commit '
678f788fea3380e5cbbf75baac5cc0ce07a56a42 ':
configure: Set the initial ldflags to match the cflags
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:23:45 +0000 (14:23 +0200)]
Merge commit '
1a4c5fe56008c61b0362c75bea5d446dc5b256bc '
* commit '
1a4c5fe56008c61b0362c75bea5d446dc5b256bc ':
libopenh264enc: Use av_log() to log messages
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:20:05 +0000 (14:20 +0200)]
Merge commit '
8aecec84021a61b943718ff3d7c2c57fcd4af199 '
* commit '
8aecec84021a61b943718ff3d7c2c57fcd4af199 ':
qsvdec: make ff_qsv_decode_init() static
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:17:29 +0000 (14:17 +0200)]
Merge commit '
539e5ac2ecfec2e2f441222a43fb0583643ea607 '
* commit '
539e5ac2ecfec2e2f441222a43fb0583643ea607 ':
examples/qsvdec: free the lavc decoder before closing MFX/VAAPI
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:17:23 +0000 (14:17 +0200)]
Merge commit '
3ee462dca1038e63b8e8d5e751121736d5772a5d '
* commit '
3ee462dca1038e63b8e8d5e751121736d5772a5d ':
examples/qsvdec: do not free the surfaces in the frame_free() callback
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:17:09 +0000 (14:17 +0200)]
Merge commit '
2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2 '
* commit '
2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2 ':
qsvdec: close the MFX decoder on uninit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:14:10 +0000 (14:14 +0200)]
Merge commit '
d0c8c380ecf3d9bb16621a4fb59ebbcde301002a '
* commit '
d0c8c380ecf3d9bb16621a4fb59ebbcde301002a ':
qsv: document AVQSVContext members
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:12:47 +0000 (14:12 +0200)]
Merge commit '
5d2daebf3cc8de4cee1973db6a2229beaad3b7cd '
* commit '
5d2daebf3cc8de4cee1973db6a2229beaad3b7cd ':
qsvenc: mark the encoders as INIT_CLEANUP
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 12:10:25 +0000 (14:10 +0200)]
Merge commit '
83847cc8fa97e0fc637a0962bafb837acdb6eacc '
* commit '
83847cc8fa97e0fc637a0962bafb837acdb6eacc ':
qsvenc: do not try to close the encoder if the session is NULL
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:53:42 +0000 (13:53 +0200)]
Merge commit '
741b352b16dad74b87c4a39bade8902633a2b0e6 '
* commit '
741b352b16dad74b87c4a39bade8902633a2b0e6 ':
qsvdec: list supported pixel formats
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:48:58 +0000 (13:48 +0200)]
Merge commit '
ae25413daf42a06f078ed81bb545ec23a8e0b482 '
* commit '
ae25413daf42a06f078ed81bb545ec23a8e0b482 ':
lavfi: do not exclude hwaccel formats from ff_all_formats()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:48:24 +0000 (13:48 +0200)]
Merge commit '
cc285521000020ab237d183dc3a26f99fce3030f '
* commit '
cc285521000020ab237d183dc3a26f99fce3030f ':
checkasm/x86: Correctly handle variadic functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:48:05 +0000 (13:48 +0200)]
Merge commit '
5405584b7b54ca889c341743de1d58792449830d '
* commit '
5405584b7b54ca889c341743de1d58792449830d ':
checkasm: Use a self-balancing tree
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:45:38 +0000 (13:45 +0200)]
Merge commit '
a41e5e192ed8f79f6607f978dee3205580ba5039 '
* commit '
a41e5e192ed8f79f6607f978dee3205580ba5039 ':
vdpau: fix constrained baseline fallback
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:45:23 +0000 (13:45 +0200)]
Merge commit '
cc8db760616a7ec3bd39b22ca45888c01326db13 '
* commit '
cc8db760616a7ec3bd39b22ca45888c01326db13 ':
mpegts: use avcodec_get_type() to set codec_type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:45:19 +0000 (13:45 +0200)]
Merge commit '
a5d58fea68b9212e0065a71939e921505504a9bb '
* commit '
a5d58fea68b9212e0065a71939e921505504a9bb ':
lavc: reimplement avcodec_get_type() using codec descriptors
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Tue, 29 Sep 2015 11:44:59 +0000 (13:44 +0200)]
Merge commit '
b10b6ac7a902f28e09e37a29c392e2f0c19e9526 '
* commit '
b10b6ac7a902f28e09e37a29c392e2f0c19e9526 ':
vdpau: deprecate av_vdpau_get_profile()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Michael Niedermayer [Tue, 29 Sep 2015 11:08:48 +0000 (13:08 +0200)]
avcodec/x86/sbrdsp: Fix using uninitialized upper 32bit of noise
Fixes crash
Fixes: flicker-1.scout3d21443372922.28.m4a
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Vicente Olivert Riera [Fri, 25 Sep 2015 06:56:25 +0000 (08:56 +0200)]
mips: intreadwrite: Only execute that code for mips r1 or r2
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>
Luca Barbato [Fri, 25 Sep 2015 06:56:25 +0000 (08:56 +0200)]
configure: mips: Support mips r6, r2 and r1
Detect the different MIPS architecture variants.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Fri, 25 Sep 2015 06:56:25 +0000 (08:56 +0200)]
configure: Set the initial ldflags to match the cflags
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>
Gregory J. Wolfe [Wed, 9 Sep 2015 19:32:42 +0000 (15:32 -0400)]
libopenh264enc: Use av_log() to log messages
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>
Ganesh Ajjanagadde [Sat, 19 Sep 2015 21:41:30 +0000 (17:41 -0400)]
avcodec/videotoolbox: fix -Wunused-but-set-variable
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>
Thierry Foucu [Mon, 28 Sep 2015 21:34:45 +0000 (14:34 -0700)]
libavformat/flvdec.c: free always the packet after a resync.
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>
Paul B Mahol [Mon, 28 Sep 2015 18:53:01 +0000 (20:53 +0200)]
avcodec/pngdec: reset has_trns after every decode_frame_png()
Fixes #4887.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Henrik Gramner [Mon, 28 Sep 2015 16:50:13 +0000 (18:50 +0200)]
checkasm/vp9dsp: Fix iszero() to read the correct data
Ronald S. Bultje [Tue, 22 Sep 2015 18:24:27 +0000 (14:24 -0400)]
checkasm: add vp9dsp.itxfm_add tests.
Henrik Gramner [Sat, 26 Sep 2015 18:15:35 +0000 (20:15 +0200)]
checkasm: Fix the function name sorting algorithm
The previous implementation was behaving incorrectly in some corner cases.
Anton Khirnov [Wed, 5 Aug 2015 12:30:37 +0000 (14:30 +0200)]
qsvdec: make ff_qsv_decode_init() static
It is not used outside of qsvdec.c anymore.
Anton Khirnov [Tue, 11 Aug 2015 13:00:24 +0000 (15:00 +0200)]
examples/qsvdec: free the lavc decoder before closing MFX/VAAPI
lavc expects MFX to still be in a usable state on close.
Anton Khirnov [Tue, 11 Aug 2015 12:57:07 +0000 (14:57 +0200)]
examples/qsvdec: do not free the surfaces in the frame_free() callback
Even though libmfx might not need them anymore, avcodec might still
access the surfaces. So free them separately at the end.
Anton Khirnov [Tue, 11 Aug 2015 12:52:31 +0000 (14:52 +0200)]
qsvdec: close the MFX decoder on uninit