Thomas Turner
824fe914fe
avcodec/tests: added test for celp_math.c
...
Signed-off-by: Thomas Turner <thomastdt@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-24 17:31:38 +01:00
Paul B Mahol
e1940d2458
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>
2017-03-24 15:44:01 +01:00
James Almer
ac42f08099
x86/hevc_add_res: merge missing changes from 3d65359832
...
Unrolling the loops triplicates the size of the assembled output
while not generating any gain in performance.
2017-03-24 11:24:18 -03:00
Clément Bœsch
63ad47d76b
Merge commit ' fbe425c8d2'
...
* commit 'fbe425c8d2 ':
hap: Adjust printf length modifiers to match variable types
This commit is a noop, see 5a51ca2da7
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:38:11 +01:00
Clément Bœsch
46f4f8ad86
Merge commit ' 1263b2039e'
...
* commit '1263b2039e ':
Adjust printf conversion specifiers to match variable signedness
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:34:39 +01:00
Clément Bœsch
1436769c57
Merge commit ' ca1e5eea0c'
...
* commit 'ca1e5eea0c ':
Remove some pointless TRACE level debug code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:23:52 +01:00
Clément Bœsch
bb9fdd9f61
Merge commit ' 07eea5a5de'
...
* commit '07eea5a5de ':
nut: Drop pointless TRACE level debug code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:21:04 +01:00
Clément Bœsch
50a06c841f
Merge commit ' c3dad1bf3b'
...
* commit 'c3dad1bf3b ':
nsv: Drop unnecessary TRACE level debug code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:19:10 +01:00
Clément Bœsch
e809c2e40d
Merge commit ' 47756f51fe'
...
* commit '47756f51fe ':
dnxhdenc: Drop pointless, commented-out debug output
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:18:24 +01:00
Clément Bœsch
2a69724fd5
Merge commit ' 0456e68439'
...
* commit '0456e68439 ':
audio_fifo: Drop write-only variable
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:17:55 +01:00
Clément Bœsch
4c840c249d
Merge commit ' 0574780d7a'
...
* commit '0574780d7a ':
h264_loopfilter: Do not print value of uninitialized variable
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:15:15 +01:00
Clément Bœsch
fe7cae3880
Merge commit ' 2555269985'
...
* commit '2555269985 ':
mpegaudio: Do not print value of uninitialized variable
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:14:03 +01:00
Clément Bœsch
3a3791a582
Merge commit ' 14cab426b0'
...
* commit '14cab426b0 ':
build: Hardcode avversion.h dependency
This commit is a noop, see:
4d0ac9aee9
4ae87554f3
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:12:21 +01:00
Clément Bœsch
65cb02301a
Merge commit ' f22363c729'
...
* commit 'f22363c729 ':
openssl: Avoid double semicolons after the GET_BIO_DATA macro
This commit is a noop, see fc83de7e1d
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:10:15 +01:00
Clément Bœsch
d1ab8c66cf
Merge commit ' 052b97855d'
...
* commit '052b97855d ':
aviocat: Support avio options
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:07:50 +01:00
Clément Bœsch
99c9e00c68
Merge commit ' 99aeae20de'
...
* commit '99aeae20de ':
scale_npp: fix passthrough mode
This commit is a noop, see f524275ef9
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:06:37 +01:00
Clément Bœsch
9da2b37668
Merge commit ' 0aec37e625'
...
* commit '0aec37e625 ':
vaapi_decode: Remove vestigial unmap code
vaapi_decode: Clear parameter buffers to fix picture reuse
This merge is a noop, see 79307ae563
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:04:33 +01:00
Clément Bœsch
b062538841
Merge commit ' 754b20d7eb'
...
* commit '754b20d7eb ':
vaapi_h264: fix RefPicList[] field flags.
This commit is a noop, see 88325c2e0b
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:01:56 +01:00
Clément Bœsch
fc83de7e1d
Merge commit ' ee05079766'
...
* commit 'ee05079766 ':
openssl: Support version 1.1.0.
This commit is mostly a noop, see 798c6ecce5
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>
2017-03-24 12:59:21 +01:00
Clément Bœsch
2c47d24358
Merge commit ' 016387fe0f'
...
* commit '016387fe0f ':
rtmpdh: Don't use the OpenSSL DH struct
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 12:43:49 +01:00
Clément Bœsch
761bbb06ff
Merge commit ' 2f806622e1'
...
* commit '2f806622e1 ':
bktr: Use memset(0) instead of zero initialization for struct sigaction
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 12:41:31 +01:00
Clément Bœsch
3d4039f964
Merge commit ' ed48a9d814'
...
* commit 'ed48a9d814 ':
checkasm: Add a test for HEVC add_residual
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 12:37:09 +01:00
Clément Bœsch
3d65359832
Merge commit ' 6d5636ad9a'
...
* commit '6d5636ad9a ':
hevc: x86: Add add_residual() SIMD optimizations
See a6af4bf64d
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>
2017-03-24 12:33:25 +01:00
Clément Bœsch
40ac226014
lavc/x86/hevc: rename hevc_res_add to hevc_add_res
...
This will simplify incoming merge.
2017-03-24 11:45:23 +01:00
Clément Bœsch
71d541751e
Merge commit ' 043b0b9fb1'
...
* commit '043b0b9fb1 ':
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>
2017-03-24 11:40:35 +01:00
Clément Bœsch
30ac66abf0
Merge commit ' 4b07ebf1eb'
...
* commit '4b07ebf1eb ':
mov: Update colr values
Mostly noop, see a3cab3d433
Only the use of av_color_{primaries,transfer,space}_name() is merged.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 11:33:47 +01:00
Clément Bœsch
0b3decc596
Merge commit ' 0d9b9bd37f'
...
* commit '0d9b9bd37f ':
lavu: Add JEDEC P22 color primaries
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 11:21:46 +01:00
Clément Bœsch
a44ab512e6
lavu/pixfmt: fix redundant comment
...
Mistake introduced in a1f6b1d9d8 .
2017-03-24 11:17:51 +01:00
James Almer
9bcc5e8973
Merge commit ' 7c9e2b295e'
...
* commit '7c9e2b295e ':
Makefile: fix checking whether reconfiguring is required
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 20:54:20 -03:00
James Almer
e9d4b3dc37
Merge commit ' 59c90097a0'
...
* commit '59c90097a0 ':
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>
2017-03-23 20:49:24 -03:00
Clément Bœsch
99dd6fe62c
sws/tests/pixdesc_query: remove func wrappers
2017-03-24 00:06:35 +01:00
Clément Bœsch
bc7308aae8
sws: make is{RGB,BGR}inInt functions
2017-03-24 00:06:35 +01:00
James Almer
dc39ccdc3b
Merge commit ' 0bfdcce4d4'
...
* commit '0bfdcce4d4 ':
hevc: move the SliceType enum to hevc.h
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 20:02:11 -03:00
James Almer
0f4abbd4ee
doc/libav-merge: add a line about the extract_extradata commits
2017-03-23 19:49:09 -03:00
James Almer
950c3fa520
Merge commit ' 096a8effa3'
...
* commit '096a8effa3 ':
lavf: check that the codec is supported by extract_extradata
This commit is a noop. The code it changes was reverted.
See 40fa9d416a
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 19:41:50 -03:00
James Almer
40fa9d416a
Revert "Merge commit ' 8e2ea69135'"
...
This reverts commit 1c193ac1f9 , reversing
changes made to 7ebc9f8df4 .
Several FATE tests started failing after this merge, so it's reverted
until it can be properly fixed.
2017-03-23 19:34:00 -03:00
James Almer
380448194f
Merge commit ' 788544ff0e'
...
* commit '788544ff0e ':
audiodsp: x86: Remove pointless header file
This commit is a noop, see 6ec3dc97fc
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:45:56 -03:00
James Almer
d07f2dacb9
Merge commit ' 1f821e5ad3'
...
* commit '1f821e5ad3 ':
configure: Print warnings after all other output
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:43:39 -03:00
James Almer
bac44a5020
Merge commit ' b89804da9b'
...
* commit 'b89804da9b ':
x86: videodsp: Add parentheses to expression to work around warning
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:35:49 -03:00
James Almer
acf125f333
Merge commit ' da4f8c8e35'
...
* commit 'da4f8c8e35 ':
fate: Update filter-pixfmts-scale gbrap12le hash missing from be9dba5c8a
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:33:50 -03:00
James Almer
0d34473d8e
Merge commit ' dd5d4a0e1e'
...
* commit 'dd5d4a0e1e ':
checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:31:36 -03:00
James Almer
c97e986e90
Merge commit ' 7911186ed6'
...
* commit '7911186ed6 ':
emms: Give apriv_emms_yasm() a more general name
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:28:56 -03:00
James Almer
0dcfa02fd2
Merge commit ' be9dba5c8a'
...
* commit 'be9dba5c8a ':
swscale: Properly load alpha for planar rgb
This commit is a noop, see
4170a44bbc
df36257a53
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:27:01 -03:00
James Almer
78c52e2721
Merge commit ' d32571626a'
...
* commit 'd32571626a ':
build: Add VSX-OBJS to SUBDIR_VARS
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:20:29 -03:00
James Almer
09a80419b7
Merge commit ' 58224dc5f3'
...
* commit '58224dc5f3 ':
ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:17:45 -03:00
James Almer
530066166e
Merge commit ' 0cf86fabfa'
...
* commit '0cf86fabfa ':
vaapi_encode: Write sequence header as extradata
This commit is a noop. It has already been cherry-picked in
51020adcec
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:15:42 -03:00
James Almer
c43fd1f279
Merge commit ' f9bb356e0e'
...
* commit 'f9bb356e0e ':
vaapi_h265: Include header for slice types
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:08:41 -03:00
James Almer
29db87af52
Merge commit ' 6be7944ee2'
...
* commit '6be7944ee2 ':
x86: Add missing colons after assembly labels
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:05:27 -03:00
James Almer
f23078904f
Merge commit ' 2816f8a8bb'
...
* commit '2816f8a8bb ':
build: Drop arch-specific checkasm Makefiles
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:01:47 -03:00
James Almer
3ddae9eee9
Merge commit ' 93d5b022a9'
...
* commit '93d5b022a9 ':
build: Drop duplicate asm recipe
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 17:57:35 -03:00