Michael Niedermayer
c5fc48fdfb
Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'
...
* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
riff: Add MNM4 FourCC as mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 21:18:13 +02:00
James Zern
8ce321f0aa
encoders.texi: update libvpx documentation
...
modeled after the libx264 section.
Reviewed-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
2015-06-15 12:09:02 -07:00
Michael Niedermayer
2819aeb0f3
avcodec/jpeg2000dec: Omit mqc reinit after the last pass
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 20:49:04 +02:00
Paul B Mahol
d107413f1c
doc/filters: add one more compand example found in the wild
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-15 17:20:23 +00:00
Andreas Cadhalpun
dd6c8575db
examples/demuxing_decoding: use properties from frame instead of video_dec_ctx
...
This is more robust.
And only check if there is actually a frame returned.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-15 18:32:18 +02:00
Andreas Cadhalpun
fdc64a1044
h264: er: Copy from the previous reference only if compatible
...
Also use the frame pixel format instead of the one from the codec
context, which is more robust.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-15 18:32:18 +02:00
Michael Niedermayer
96bbbebaf9
avcodec/jpeg2000dec: Fix Vertically causal context formation
...
Fixes Ticket4626
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 18:12:45 +02:00
Michael Niedermayer
021351f246
avcodec/mqcdec: set raw flag at the begin of ff_mqc_initdec()
...
This way it is available to any functions called from ff_mqc_initdec()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 17:11:01 +02:00
Michael Niedermayer
4ec14ce121
avcodec/jpeg2000dec: Improve readability of SOP check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 13:29:41 +02:00
Vittorio Giovara
07b2db81d0
riff: Add MNM4 FourCC as mpeg4
2015-06-15 12:29:25 +01:00
Michael Niedermayer
9ba5fe7f3d
avcodec/jpeg2000dec: Remove redundant check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 03:11:58 +02:00
Michael Niedermayer
5b0f55aab9
avcodec/jpeg2000dec: Check reslevelno in RPCL
...
Fixes out of array read
Fixes Ticket4627
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 03:00:53 +02:00
Michael Niedermayer
a58f1bcc4c
avcodec/jpeg2000dec: Skip SOP
...
Fixes Ticket4625
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 02:32:45 +02:00
Michael Niedermayer
4bfdd967a6
avcodec/jpeg2000dec: Use <0 instead of != 0 for error checking
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 02:19:48 +02:00
Michael Niedermayer
5ef578d03a
avcodec/jpeg2000dec: Also include remaining length in "Block length" error message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 01:43:14 +02:00
Michael Niedermayer
dd9400930a
Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'
...
* commit '74ea1167d91ccb2e1f2943efa030f2c278b598be':
tls_gnutls: fix hang on disconnection
See: 2222f419da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 01:30:55 +02:00
Michael Niedermayer
ec5164aa31
avcodec/jpeg2000: Fix regression with multiple tiles
...
Fixes Ticket 4624
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 22:59:50 +02:00
Michael Niedermayer
a206c13289
avcodec/jpeg2000: Change codeblock coords to same origin as bands
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 22:59:50 +02:00
Michael Niedermayer
d9841e53e2
avcodec/jpeg2000: Change precinct coords to same origin as bands
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 22:59:42 +02:00
Michael Niedermayer
59c107292c
avcodec/jpeg2000: Fix band coords
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 21:58:38 +02:00
Michael Niedermayer
6b08dc393b
avcodec/jpeg2000dec: Print warning if the mqc pointer mismatches at the end
...
If this occurs on valid and correctly decoded files it should be reduced to debug
level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 21:40:09 +02:00
wm4
2222f419da
tls_gnutls: fix hang on disconnection
...
GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.
Use GNUTLS_SHUT_WR instead, which doesn't have this problem.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 21:40:08 +02:00
Michael Niedermayer
91c8025c44
avcodec/jpeg2000dec: Show the progression order at debug level for all variants
...
It was previously shown just for some, this makes it consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 21:40:08 +02:00
Paul B Mahol
20ee65ef73
avfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMIN
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-14 17:08:43 +00:00
wm4
74ea1167d9
tls_gnutls: fix hang on disconnection
...
GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.
Use GNUTLS_SHUT_WR instead, which doesn't have this problem.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-06-14 19:50:03 +03:00
Michael Niedermayer
742a26c489
avcodec/jpeg2000dec: Print error messages for more error conditions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 15:15:51 +02:00
Andreas Cadhalpun
ed0b1db640
doc: fix spelling errors
...
Neccessary -> Necessary
formated -> formatted
thee -> the
eventhough -> even though
seperately -> separately
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-14 15:09:33 +02:00
Michael Niedermayer
ad072a134f
avcodec/jpeg2000dec: Handle format that has planes matching YUVA420P structure but seems not to be that
...
Outputs something for p0_05.j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 13:01:12 +02:00
Michael Niedermayer
132bf0bbb7
avcodec/jpeg2000dec: Print all cdx/cdy values not just the 2nd and 3rd
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 11:49:49 +02:00
Clément Bœsch
1dee7a31e0
avfilter: bump minor after colorkey addition
2015-06-14 11:20:47 +02:00
Philip Langdale
1b19d0c632
avcodec/hevc: Track long and short term RPS size for VDPAU
...
Today, we track the short term RPS size for DXVA, but only if the
SliceHeader RPS is being used. Otherwise it's left uninitialized.
NVIDIA's VDPAU implementation requires that the size be accurately
tracked even if an SPS RPS is being used. In this case, it's really
counting the size of the RPS idx information, but you end up with
mangled output if the value is not accurate.
VDPAU also needs the size of the long term RPS.
Signed-off-by: Philip Langdale <philipl@overt.org>
2015-06-13 21:09:24 -07:00
Philip Langdale
01fac84fe4
avcodec/nvenc: Enable YV12 input format
...
This has been enabled by recent nvidia driver releases.
Signed-off-by: Philip Langdale <philipl@overt.org>
2015-06-13 21:09:24 -07:00
Michael Niedermayer
4a3bc0d9a5
avcodec/jpeg2000dec: Implement "Reset context probabilities on coding pass boundaries"
...
No testcase with just this feature known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 03:38:41 +02:00
James Almer
20abb1afe5
softfloat: make av_div_sf() inline
...
Removes a defined but not used warning on files including softfloat.h
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-06-13 22:28:39 -03:00
Michael Niedermayer
612f8cae06
avcodec/jpeg2000dec: Support RPCL
...
Fixes Ticket 2792
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 02:53:51 +02:00
Timo Rothenpieler
f17d973413
avfilter/vf_colorkey: Add colorkey video filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-14 01:04:14 +02:00
James Almer
4aebaed0e1
avformat/singlejpeg: fix standalone compilation
2015-06-13 17:47:13 -03:00
James Almer
9f815bc2c2
avcodec/jpeg200dsp: add ff_rct_int_{sse2,avx2}
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-06-13 16:53:31 -03:00
James Almer
7912a6830d
avcodec/jpeg200dsp: add ff_ict_float_{sse,avx}
...
Original intrinsics version by Nicolas Bertrand.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-06-13 16:53:27 -03:00
Michael Niedermayer
a98d4d5207
avfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_color()
...
Theres currently no case where this could be triggered
Found-by: Daemon404
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 21:33:18 +02:00
Clément Bœsch
8978052869
avfilter/lut3d: assert on pixel format descriptor
...
inlink->format is supposed to be set to a valid format controlled by query_formats().
2015-06-13 20:51:43 +02:00
Clément Bœsch
a056636c81
avfilter/geq: assert on pixel format descriptor
...
inlink->format is supposed to be set to a valid format controlled by query_formats().
2015-06-13 20:51:43 +02:00
Andreas Cadhalpun
45babb0121
configure: only disable VSX for !ppc64el
...
This reverts commit 04f0002
, which made it impossible to enable VSX with
a generic cpu.
This changes the behavior back to what it was before commit b0af404
.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-13 20:42:38 +02:00
Clément Bœsch
324cf0645d
avcodec/ass_split: check ASSSplitContext alloc
2015-06-13 20:39:57 +02:00
Michael Niedermayer
c3517c377e
avcodec/jpeg2000dec: Support PCRL
...
Fixes Ticket4603
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 13:56:49 +02:00
Michael Niedermayer
eb1beb9e1c
avcodec/jpeg2000dec: Try to fix remaining DCinema hardcoded TODOs in CPRL
...
Again, no testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 13:37:56 +02:00
Michael Niedermayer
0a3eb0422a
avcodec/jpeg2000dec: try to correct tile location in CPRL code
...
No testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 13:09:13 +02:00
Michael Niedermayer
7c244349fc
avcodec/jpeg2000dec: Factorize component out of CPRL loop
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 13:09:13 +02:00
Michael Niedermayer
86efe83177
avcodec/jpeg2000dec: Fix x/y step TODO for CPRL
...
No testcase known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-13 13:09:13 +02:00
Carl Eugen Hoyos
3323c5f353
Remove a few occurences of "long long" from the libraries.
2015-06-13 09:28:41 +02:00