]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Mon, 27 Mar 2017 20:21:18 +0000 (22:21 +0200)]
Merge commit '
c541a44e029e8a4f21db028c34fee3ad1c10a409 '
* commit '
c541a44e029e8a4f21db028c34fee3ad1c10a409 ':
Revert "rtmpproto: Don't include a client version in the unencrypted C1 handshake"
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Mar 2017 20:19:09 +0000 (22:19 +0200)]
Merge commit '
801ac7156d3efb8e088fb6024f568eb36a293887 '
* commit '
801ac7156d3efb8e088fb6024f568eb36a293887 ':
qsv: Be informative when reporting that no data has been consumed
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Mar 2017 20:16:50 +0000 (22:16 +0200)]
Merge commit '
30015305f3b523ed7640f2c3c58b017140533c58 '
* commit '
30015305f3b523ed7640f2c3c58b017140533c58 ':
Use avpriv_request_sample() where appropriate
Only the roqvideo chunk is merged because we actually support 24bpp
flic, see
5781c983d880e17ffc9b283baa9fb13bad1748f9 .
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Mar 2017 20:09:08 +0000 (22:09 +0200)]
Merge commit '
07cac07c0c0360d67e73a7472214c79d6c520a4b '
* commit '
07cac07c0c0360d67e73a7472214c79d6c520a4b ':
dash: Use correct ISO C scanf conversion specifier
This commit is a noop: the use of SCN (scanf) format is wrong here.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Mar 2017 20:07:19 +0000 (22:07 +0200)]
Merge commit '
3ec6f855d0f21d90a0494fb798c4cf203fdb3db0 '
* commit '
3ec6f855d0f21d90a0494fb798c4cf203fdb3db0 ':
srt: Adjust signedness of sscanf format strings
This commit is a noop, a different fix is included in the big -Wformat
patch under review
(http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209239.html)
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Mar 2017 20:05:50 +0000 (22:05 +0200)]
Merge commit '
7a2b2b6a92c4b528ecb640790eca0aa790d858f4 '
* commit '
7a2b2b6a92c4b528ecb640790eca0aa790d858f4 ':
dxtory: Drop nonsense ISO C printf conversion specifiers for standard types
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Mar 2017 20:01:06 +0000 (22:01 +0200)]
Merge commit '
c454dfcff90f0ed39c7b0d4e85664986a8b4476c '
* commit '
c454dfcff90f0ed39c7b0d4e85664986a8b4476c ':
Use ISO C printf conversion specifiers where appropriate
This commit is a noop, an equivalent patch is currently under review on
the mailing-list: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209239.html
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 25 Mar 2017 12:33:07 +0000 (13:33 +0100)]
lavc/vp9: clarify inv_recenter_nonneg
Ends up identical to Libav.
Clément Bœsch [Sat, 25 Mar 2017 12:24:46 +0000 (13:24 +0100)]
lavc/vp9: shuffle header declaration
This reduces diff with Libav.
Clément Bœsch [Sat, 25 Mar 2017 12:19:52 +0000 (13:19 +0100)]
lavc/vp9: consistent use of typedef instead of struct
Clément Bœsch [Sat, 25 Mar 2017 11:40:48 +0000 (12:40 +0100)]
lavc/vp9: misc cosmetics
Imported from Libav
Clément Bœsch [Sat, 25 Mar 2017 11:35:01 +0000 (12:35 +0100)]
lavc/vp9: rename res to ret
Clément Bœsch [Sat, 25 Mar 2017 11:32:45 +0000 (12:32 +0100)]
lavc/vp9: split a few assignment out of ifs
Clément Bœsch [Sat, 25 Mar 2017 11:28:31 +0000 (12:28 +0100)]
lavc/vp9: rename {ref,unref,alloc}_frame to frame_{ref,unref,alloc}
For consistency with Libav.
Clément Bœsch [Sat, 25 Mar 2017 11:25:28 +0000 (12:25 +0100)]
lavc/vp9: rename ctx to avctx
This reduces diff with Libav. It also prevents a potential confusion
between the private context and the AVCodecContext.
Clément Bœsch [Sat, 25 Mar 2017 11:10:13 +0000 (12:10 +0100)]
lavc/vp9: split into vp9{block,data,mvs}
This is following Libav layout to ease merges.
Rostislav Pehlivanov [Mon, 27 Mar 2017 17:34:15 +0000 (18:34 +0100)]
Changelog: reorder last entry
Entries are organized in descending chronological order.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Mon, 6 Mar 2017 02:46:51 +0000 (02:46 +0000)]
lavfi: remove af_asynts filter
Long overdue for removal, af_aresample should be used instead.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
wm4 [Mon, 27 Mar 2017 11:06:56 +0000 (13:06 +0200)]
pthread_frame: fix uninitialized variable read
Could lead to random behavior. This possibly happened due to commit
32a5b631267 . This should/could probably be simplified, but for no apply
a minimal fix to quell the errors.
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
wm4 [Thu, 23 Mar 2017 12:18:16 +0000 (13:18 +0100)]
pthread_frame: do not attempt to unlock a mutex on the wrong thread
async_mutex has is used in a very strange but intentional way: it is
locked by default, and unlocked only in regions that can be run
concurrently.
If the user was calling API functions to the same context from different
threads (in a safe way), this could unintentionally unlock the mutex on
a different thread than the previous lock operation. It's not allowed by
the pthread API.
Fix this by emulating a binary semaphore using a mutex and condition
variable. (Posix semaphores are not available on all platforms.)
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
wm4 [Tue, 21 Mar 2017 07:02:58 +0000 (08:02 +0100)]
avformat, ffmpeg: deprecate old rotation API
The old "API" that signaled rotation as a metadata value has been
replaced by DISPLAYMATRIX side data quite a while ago.
There is no reason to make muxers/demuxers/API users support both. In
addition, the metadata API is dangerous, as user tags could "leak" into
it, creating unintended features or bugs.
ffmpeg CLI has to be updated to use the new API. In particular, we must
not allow to leak the "rotate" tag into the muxer. Some muxers will
catch this properly (like mov), but others (like mkv) can add it as
generic tag. Note applications, which use libavformat and assume the
old rotate API, will interpret such "rotate" user tags as rotate
metadata (which it is not), and incorrectly rotate the video.
The ffmpeg/ffplay tools drop the use of the old API for muxing and
demuxing, as all muxers/demuxers support the new API. This will mean
that the tools will not mistakenly interpret per-track "rotate" user
tags as rotate metadata. It will _not_ be treated as regression.
Unfortunately, hacks have been added, that allow the user to override
rotation by setting metadata explicitly, e.g. via
-metadata:s:v:0 rotate=0
See references to trac #4560. fate-filter-meta-4560-rotate0 tests this.
It's easier to adjust the hack for supporting it than arguing for its
removal, so ffmpeg CLI now explicitly catches this case, and essentially
replaces the "rotate" value with a display matrix side data. (It would
be easier for both user and implementation to create an explicit option
for rotation.)
When the code under FF_API_OLD_ROTATE_API is disabled, one FATE
reference file has to be updated (because "rotate" is not exported
anymore).
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Kyle Swanson [Sun, 26 Mar 2017 18:48:28 +0000 (13:48 -0500)]
libavcodec/opusenc: use correct format specifiers
Squelches the following compiler warnings:
libavcodec/opusenc.c:1051:16: warning: format specifies type 'long' but
the argument has type 'long long' [-Wformat]
avctx->bit_rate/1000, clipped_rate/1000);
^~~~~~~~~~~~~~~~~~~~
libavcodec/opusenc.c:1051:38: warning: format specifies type 'long' but
the argument has type 'long long' [-Wformat]
avctx->bit_rate/1000, clipped_rate/1000);
^~~~~~~~~~~~~~~~~
Michael Niedermayer [Sun, 26 Mar 2017 19:17:54 +0000 (21:17 +0200)]
avcodec/avcodec: Correct and make consistent AVERROR() in comments
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mark Thompson [Wed, 22 Mar 2017 21:19:11 +0000 (21:19 +0000)]
ffmpeg: Remove hw_device_ctx output filter reinit hack
This was skipped in
c17563c5d3c974a69709ebae0171534763b3051c because
it depended on the filter setup merge, but was forgotten after that
actually happened.
Fixes hwaccel fate for stream size change tests.
Michael Niedermayer [Sun, 26 Mar 2017 18:34:47 +0000 (20:34 +0200)]
avfilter/vf_signature: Replace uncommon spelling of seperate
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 24 Mar 2017 02:09:32 +0000 (03:09 +0100)]
avcodec/h264idct_template: Fix multiple runtime error: signed integer overflow
Fixes: 712/clusterfuzz-testcase-6647676227551232
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 26 Mar 2017 00:38:34 +0000 (01:38 +0100)]
avcodec/x86/idctdsp: Remove duplicate include
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 26 Mar 2017 00:15:04 +0000 (01:15 +0100)]
doc/bitstream_filters: Fix project name after merge
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 25 Mar 2017 16:50:51 +0000 (13:50 -0300)]
ffprobe: support skip_samples packet side data information
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 24 Mar 2017 21:27:37 +0000 (18:27 -0300)]
avcodec/extract_extradata_bsf: use the parsing code from mpeg4video_split()
It's a simplifaction of the same code, originally commited as
3b5ad8fbf77 .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 24 Mar 2017 21:26:03 +0000 (18:26 -0300)]
avcodec/extract_extradata_bsf: use the parsing code from vc1_split()
It's a simplifaction of the same code, originally commited as
b4b9a64bdb6 .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 24 Mar 2017 21:10:53 +0000 (18:10 -0300)]
avcodec/extract_extradata_bsf: use the parsing code from mpegvideo_split()
Changes to the parsing code originally committed to mpegvideo_parser.c
in
73fb23dc5a5 .
Required by some samples, like PVA_test-partial.pva
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 26 Mar 2017 00:36:10 +0000 (21:36 -0300)]
avformat/mov: stop using deprecated codec flags
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 26 Mar 2017 00:35:52 +0000 (21:35 -0300)]
avfilter: stop using deprecated codec flags
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 26 Mar 2017 00:35:15 +0000 (21:35 -0300)]
avcodec: stop using deprecated codec flags
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 26 Mar 2017 00:34:52 +0000 (21:34 -0300)]
ffmpeg: stop using deprecated codec flags
Signed-off-by: James Almer <jamrial@gmail.com>
Timo Rothenpieler [Sat, 25 Mar 2017 21:31:22 +0000 (22:31 +0100)]
configure: cuvid hwaccels need the corresponding decoder, not the other way around
James Almer [Sat, 25 Mar 2017 01:11:34 +0000 (22:11 -0300)]
fate/checkasm: fix use of uninitialized memory on hevc_add_res tests
James Almer [Sat, 25 Mar 2017 01:11:22 +0000 (22:11 -0300)]
fate/checkasm: use LOCAL_ALINGED_32 on hevc_add_res tests
Clément Bœsch [Fri, 24 Mar 2017 21:28:02 +0000 (22:28 +0100)]
fate: mask errors while constructing report files
The first case was forgotten in
89790ba2bfc9d0dc5ad407c5724b6ee616ecde58 .
Note: build_only=yes is one of the case where hiding the errors makes
sense.
Carl Eugen Hoyos [Sun, 26 Feb 2017 10:03:50 +0000 (11:03 +0100)]
lavc/xface: Reorder conditions to silence a gcc warning.
libavcodec/xface.c:318:27: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
Michael Niedermayer [Fri, 24 Mar 2017 16:45:56 +0000 (17:45 +0100)]
avcodec/tests/celp_math: Change IsAlmostEqual() to a function
Fixes empty statement, found by ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Thomas Turner [Fri, 24 Mar 2017 05:48:28 +0000 (22:48 -0700)]
avcodec/tests: added test for celp_math.c
Signed-off-by: Thomas Turner <thomastdt@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Mon, 20 Mar 2017 21:47:48 +0000 (22:47 +0100)]
avcodec/dnxhd_parser: take into account compressed frame size and skip it
Fixes #6214 and vsynth1-dnxhd-720p-hr-lb.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Fri, 24 Mar 2017 14:23:33 +0000 (11:23 -0300)]
x86/hevc_add_res: merge missing changes from
3d6535983282bea542dac2e568ae50da5796be34
Unrolling the loops triplicates the size of the assembled output
while not generating any gain in performance.
Clément Bœsch [Fri, 24 Mar 2017 12:38:11 +0000 (13:38 +0100)]
Merge commit '
fbe425c8d29e473a8f69ae2dc52b1a10b77f3b44 '
* commit '
fbe425c8d29e473a8f69ae2dc52b1a10b77f3b44 ':
hap: Adjust printf length modifiers to match variable types
This commit is a noop, see
5a51ca2da7b76cad2a86476590c18b26a98eafbe
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:29:45 +0000 (13:29 +0100)]
Merge commit '
1263b2039eb5aaf1522e9de9f07c787ab30a5f50 '
* commit '
1263b2039eb5aaf1522e9de9f07c787ab30a5f50 ':
Adjust printf conversion specifiers to match variable signedness
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:23:52 +0000 (13:23 +0100)]
Merge commit '
ca1e5eea0c7b72a6e30aa6488cfeced3a4853521 '
* commit '
ca1e5eea0c7b72a6e30aa6488cfeced3a4853521 ':
Remove some pointless TRACE level debug code
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:21:04 +0000 (13:21 +0100)]
Merge commit '
07eea5a5ded1141632aefecfa59dcdc26de2d7ea '
* commit '
07eea5a5ded1141632aefecfa59dcdc26de2d7ea ':
nut: Drop pointless TRACE level debug code
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:19:10 +0000 (13:19 +0100)]
Merge commit '
c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206 '
* commit '
c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206 ':
nsv: Drop unnecessary TRACE level debug code
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:18:24 +0000 (13:18 +0100)]
Merge commit '
47756f51fe836959ffa5c6e2baeacbd71e150069 '
* commit '
47756f51fe836959ffa5c6e2baeacbd71e150069 ':
dnxhdenc: Drop pointless, commented-out debug output
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:17:55 +0000 (13:17 +0100)]
Merge commit '
0456e684394dc5a7b98ab9ebb48396d743bf3730 '
* commit '
0456e684394dc5a7b98ab9ebb48396d743bf3730 ':
audio_fifo: Drop write-only variable
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:15:15 +0000 (13:15 +0100)]
Merge commit '
0574780d7a196f87ddd89d6362f4c47f3532b4c4 '
* commit '
0574780d7a196f87ddd89d6362f4c47f3532b4c4 ':
h264_loopfilter: Do not print value of uninitialized variable
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:14:03 +0000 (13:14 +0100)]
Merge commit '
255526998501f0040ae43fe4848c817a97fc578a '
* commit '
255526998501f0040ae43fe4848c817a97fc578a ':
mpegaudio: Do not print value of uninitialized variable
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:12:21 +0000 (13:12 +0100)]
Clément Bœsch [Fri, 24 Mar 2017 12:10:15 +0000 (13:10 +0100)]
Merge commit '
f22363c72968f1a1fc4881d8695ec7068b0aa03c '
* commit '
f22363c72968f1a1fc4881d8695ec7068b0aa03c ':
openssl: Avoid double semicolons after the GET_BIO_DATA macro
This commit is a noop, see
fc83de7e1d0eab29942b4ceb67b49e66e7b99226
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:07:50 +0000 (13:07 +0100)]
Merge commit '
052b97855de2396e46682bcbae97f95a258816d4 '
* commit '
052b97855de2396e46682bcbae97f95a258816d4 ':
aviocat: Support avio options
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:06:37 +0000 (13:06 +0100)]
Merge commit '
99aeae20de4d09ea313fdc619d4e2df825155e62 '
* commit '
99aeae20de4d09ea313fdc619d4e2df825155e62 ':
scale_npp: fix passthrough mode
This commit is a noop, see
f524275ef93882f27c0067e85e8fb3c0fc1a762b
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:04:33 +0000 (13:04 +0100)]
Merge commit '
0aec37e625821040c103641eec9c1e7a1efa2952 '
* commit '
0aec37e625821040c103641eec9c1e7a1efa2952 ':
vaapi_decode: Remove vestigial unmap code
vaapi_decode: Clear parameter buffers to fix picture reuse
This merge is a noop, see
79307ae56374b35cf12563a7c8e3e759658f847e
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 12:01:56 +0000 (13:01 +0100)]
Merge commit '
754b20d7ebccbe8d316b12128c8cb433d5a516ac '
* commit '
754b20d7ebccbe8d316b12128c8cb433d5a516ac ':
vaapi_h264: fix RefPicList[] field flags.
This commit is a noop, see
88325c2e0b63abf4c3482cecd43870015123764a
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 11:57:46 +0000 (12:57 +0100)]
Merge commit '
ee050797664c7c74cae262ffab05006b55d47a11 '
* commit '
ee050797664c7c74cae262ffab05006b55d47a11 ':
openssl: Support version 1.1.0.
This commit is mostly a noop, see
798c6ecce50f26a53d48e2577a34fabe46b32eb9
Included the simplifications by Martin Storsjö and fixed the
GET_BIO_DATA() macro to prevent a warning after the simplifications.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 11:43:49 +0000 (12:43 +0100)]
Merge commit '
016387fe0fe3eff1a03ec0673bf4d2967f6cad94 '
* commit '
016387fe0fe3eff1a03ec0673bf4d2967f6cad94 ':
rtmpdh: Don't use the OpenSSL DH struct
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 11:40:51 +0000 (12:40 +0100)]
Merge commit '
2f806622e1270d3ed1d41a53049a19673dafbe70 '
* commit '
2f806622e1270d3ed1d41a53049a19673dafbe70 ':
bktr: Use memset(0) instead of zero initialization for struct sigaction
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 11:37:09 +0000 (12:37 +0100)]
Merge commit '
ed48a9d8143d2575a4458589cebde69ec326afd8 '
* commit '
ed48a9d8143d2575a4458589cebde69ec326afd8 ':
checkasm: Add a test for HEVC add_residual
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 11:29:21 +0000 (12:29 +0100)]
Merge commit '
6d5636ad9ab6bd9bedf902051d88b7044385f88b '
* commit '
6d5636ad9ab6bd9bedf902051d88b7044385f88b ':
hevc: x86: Add add_residual() SIMD optimizations
See
a6af4bf64dae46356a5f91537a1c8c5f86456b37
This merge is only cosmetics (renames, space shuffling, etc).
The functionnal changes in the ASM are *not* merged:
- unrolling with %rep is kept
- ADD_RES_MMX_4_8 is left untouched: this needs investigation
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 10:45:23 +0000 (11:45 +0100)]
lavc/x86/hevc: rename hevc_res_add to hevc_add_res
This will simplify incoming merge.
Clément Bœsch [Fri, 24 Mar 2017 10:37:44 +0000 (11:37 +0100)]
Merge commit '
043b0b9fb1481053b712d06d2c5b772f1845b72b '
* commit '
043b0b9fb1481053b712d06d2c5b772f1845b72b ':
Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v
The merge also includes all our own occurences.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 10:31:30 +0000 (11:31 +0100)]
Merge commit '
4b07ebf1eb13561492f7e3c30a67f34415016b3e '
* commit '
4b07ebf1eb13561492f7e3c30a67f34415016b3e ':
mov: Update colr values
Mostly noop, see
a3cab3d43387add8914c1c471fc99d733227d81b
Only the use of av_color_{primaries,transfer,space}_name() is merged.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 10:20:41 +0000 (11:20 +0100)]
Merge commit '
0d9b9bd37f43ee29ad9f709d85c8f3be9db71104 '
* commit '
0d9b9bd37f43ee29ad9f709d85c8f3be9db71104 ':
lavu: Add JEDEC P22 color primaries
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Fri, 24 Mar 2017 10:17:51 +0000 (11:17 +0100)]
lavu/pixfmt: fix redundant comment
Mistake introduced in
a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e .
James Almer [Thu, 23 Mar 2017 23:54:20 +0000 (20:54 -0300)]
Merge commit '
7c9e2b295e4f70e8fedf9cceb12d95399a859a9c '
* commit '
7c9e2b295e4f70e8fedf9cceb12d95399a859a9c ':
Makefile: fix checking whether reconfiguring is required
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 23:49:24 +0000 (20:49 -0300)]
Merge commit '
59c90097a0eff0dc81fbec15b8900c929859d1e7 '
* commit '
59c90097a0eff0dc81fbec15b8900c929859d1e7 ':
hevc: factor out a repeated condition
This commit is a noop. It doesn't apply as our codebase has diverged
too much.
Merged-by: James Almer <jamrial@gmail.com>
Clément Bœsch [Thu, 23 Mar 2017 21:46:28 +0000 (22:46 +0100)]
sws/tests/pixdesc_query: remove func wrappers
Clément Bœsch [Thu, 23 Mar 2017 21:51:15 +0000 (22:51 +0100)]
sws: make is{RGB,BGR}inInt functions
James Almer [Thu, 23 Mar 2017 23:02:11 +0000 (20:02 -0300)]
Merge commit '
0bfdcce4d42a6e654c00ea5f9237dc987626457f '
* commit '
0bfdcce4d42a6e654c00ea5f9237dc987626457f ':
hevc: move the SliceType enum to hevc.h
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 22:49:09 +0000 (19:49 -0300)]
doc/libav-merge: add a line about the extract_extradata commits
James Almer [Thu, 23 Mar 2017 22:41:50 +0000 (19:41 -0300)]
Merge commit '
096a8effa3f8f3455292c958c3ed07e798def7bd '
* commit '
096a8effa3f8f3455292c958c3ed07e798def7bd ':
lavf: check that the codec is supported by extract_extradata
This commit is a noop. The code it changes was reverted.
See
40fa9d416a2597b1f8a1b9096bfaf05ad367999c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 22:34:00 +0000 (19:34 -0300)]
Revert "Merge commit '
8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4 '"
This reverts commit
1c193ac1f9cfe703d6a1c36795f309ba5d14bf6e , reversing
changes made to
7ebc9f8df4035ecaa84ad4429480986e3e7597ae .
Several FATE tests started failing after this merge, so it's reverted
until it can be properly fixed.
James Almer [Thu, 23 Mar 2017 21:45:56 +0000 (18:45 -0300)]
Merge commit '
788544ff0ed6fe67fda80ad6d3a0796ace035584 '
* commit '
788544ff0ed6fe67fda80ad6d3a0796ace035584 ':
audiodsp: x86: Remove pointless header file
This commit is a noop, see
6ec3dc97fcd27b619621cfb7313ce94764b16a93
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:41:46 +0000 (18:41 -0300)]
Merge commit '
1f821e5ad3f8ebacbbb362668561ad976c392c9e '
* commit '
1f821e5ad3f8ebacbbb362668561ad976c392c9e ':
configure: Print warnings after all other output
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:35:49 +0000 (18:35 -0300)]
Merge commit '
b89804da9bad2d94dd95bf20ac6187447e9c17e9 '
* commit '
b89804da9bad2d94dd95bf20ac6187447e9c17e9 ':
x86: videodsp: Add parentheses to expression to work around warning
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:33:50 +0000 (18:33 -0300)]
Merge commit '
da4f8c8e35a867f2d9fed0fb75e16c81ab968637 '
* commit '
da4f8c8e35a867f2d9fed0fb75e16c81ab968637 ':
fate: Update filter-pixfmts-scale gbrap12le hash missing from
be9dba5c8a
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:31:36 +0000 (18:31 -0300)]
Merge commit '
dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b '
* commit '
dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b ':
checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:28:56 +0000 (18:28 -0300)]
Merge commit '
7911186ed616ae81dd8617d6d0e8b08c818db9d8 '
* commit '
7911186ed616ae81dd8617d6d0e8b08c818db9d8 ':
emms: Give apriv_emms_yasm() a more general name
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:27:01 +0000 (18:27 -0300)]
James Almer [Thu, 23 Mar 2017 21:20:29 +0000 (18:20 -0300)]
Merge commit '
d32571626a2c36c026b7fa13d19ac4ed1aad75c9 '
* commit '
d32571626a2c36c026b7fa13d19ac4ed1aad75c9 ':
build: Add VSX-OBJS to SUBDIR_VARS
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:17:45 +0000 (18:17 -0300)]
Merge commit '
58224dc5f3d4fea40a8d55cca87291a960c11622 '
* commit '
58224dc5f3d4fea40a8d55cca87291a960c11622 ':
ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:13:58 +0000 (18:13 -0300)]
Merge commit '
0cf86fabfa5820596cca2cfead63c6f8df76c3f2 '
* commit '
0cf86fabfa5820596cca2cfead63c6f8df76c3f2 ':
vaapi_encode: Write sequence header as extradata
This commit is a noop. It has already been cherry-picked in
51020adcecf4004c1586a708d96acc6cbddd050a
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:08:41 +0000 (18:08 -0300)]
Merge commit '
f9bb356e0eb38ab4df32df8276b71a0b2626538f '
* commit '
f9bb356e0eb38ab4df32df8276b71a0b2626538f ':
vaapi_h265: Include header for slice types
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:05:27 +0000 (18:05 -0300)]
Merge commit '
6be7944ee2ec2f045e6eb9a93237e992c8b20ac4 '
* commit '
6be7944ee2ec2f045e6eb9a93237e992c8b20ac4 ':
x86: Add missing colons after assembly labels
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 21:01:47 +0000 (18:01 -0300)]
Merge commit '
2816f8a8bb33bd67fec5e94f5d357918caf4e055 '
* commit '
2816f8a8bb33bd67fec5e94f5d357918caf4e055 ':
build: Drop arch-specific checkasm Makefiles
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 20:48:28 +0000 (17:48 -0300)]
Merge commit '
93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81 '
* commit '
93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81 ':
build: Drop duplicate asm recipe
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 20:38:20 +0000 (17:38 -0300)]
Merge commit '
c91d6a33f872574c95c8784277cf60ffcf6bff4f '
* commit '
c91d6a33f872574c95c8784277cf60ffcf6bff4f ':
checkasm: aarch64: Add filler args to make sure all parameters are passed on the stack
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 20:36:53 +0000 (17:36 -0300)]
Merge commit '
f1b3e131385176c3c9d9783b25047856a0dcebf6 '
* commit '
f1b3e131385176c3c9d9783b25047856a0dcebf6 ':
checkasm: aarch64: Clobber the stack before calling functions
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 20:35:38 +0000 (17:35 -0300)]
Merge commit '
a05cc56124b4f1237f6355784de821e3290ddb44 '
* commit '
a05cc56124b4f1237f6355784de821e3290ddb44 ':
checkasm: arm/aarch64: Fix the amount of space reserved for stack parameters
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 19:52:42 +0000 (16:52 -0300)]
Merge commit '
8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4 '
* commit '
8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4 ':
lavf: use the new bitstream filter for extracting extradata
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 19:31:15 +0000 (16:31 -0300)]
Merge commit '
89b35a139e838deeb32ec20d8d034c81014401d0 '
* commit '
89b35a139e838deeb32ec20d8d034c81014401d0 ':
lavc: add a bitstream filter for extracting extradata from packets
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 18:41:09 +0000 (15:41 -0300)]
Merge commit '
f6e2f8a9ffda2247bffba991450990d075ea68e3 '
* commit '
f6e2f8a9ffda2247bffba991450990d075ea68e3 ':
hevcdec: move parameter set parsing into a separate header
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 18:12:23 +0000 (15:12 -0300)]
Merge commit '
150c896a9e46b23b97debb0a5f66fbaeaa32f153 '
* commit '
150c896a9e46b23b97debb0a5f66fbaeaa32f153 ':
hevcdec: split ff_hevc_diag_scan* declarations into a separate header
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 23 Mar 2017 18:07:28 +0000 (15:07 -0300)]
avcodec/hevc: add missing hevc.h header
It was lost as part of a merge in
6397815be0bee10948387fcb90ead36ec2834ef7 .