ffmpeg.git
4 years agoavcodec/mqcdec: set raw flag at the begin of ff_mqc_initdec()
Michael Niedermayer [Mon, 15 Jun 2015 15:11:01 +0000 (17:11 +0200)]
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>
4 years agoavcodec/jpeg2000dec: Improve readability of SOP check
Michael Niedermayer [Mon, 15 Jun 2015 02:21:40 +0000 (04:21 +0200)]
avcodec/jpeg2000dec: Improve readability of SOP check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Remove redundant check
Michael Niedermayer [Mon, 15 Jun 2015 01:11:58 +0000 (03:11 +0200)]
avcodec/jpeg2000dec: Remove redundant check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Check reslevelno in RPCL
Michael Niedermayer [Mon, 15 Jun 2015 01:00:53 +0000 (03:00 +0200)]
avcodec/jpeg2000dec: Check reslevelno in RPCL

Fixes out of array read
Fixes Ticket4627

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Skip SOP
Michael Niedermayer [Mon, 15 Jun 2015 00:32:45 +0000 (02:32 +0200)]
avcodec/jpeg2000dec: Skip SOP

Fixes Ticket4625

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Use <0 instead of != 0 for error checking
Michael Niedermayer [Mon, 15 Jun 2015 00:19:48 +0000 (02:19 +0200)]
avcodec/jpeg2000dec: Use <0 instead of != 0 for error checking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Also include remaining length in "Block length" error message
Michael Niedermayer [Sun, 14 Jun 2015 22:32:01 +0000 (00:32 +0200)]
avcodec/jpeg2000dec: Also include remaining length in "Block length" error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'
Michael Niedermayer [Sun, 14 Jun 2015 23:30:36 +0000 (01:30 +0200)]
Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'

* commit '74ea1167d91ccb2e1f2943efa030f2c278b598be':
  tls_gnutls: fix hang on disconnection

See: 2222f419da99ef85d49ab04e7e15b76612f4d054
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Fix regression with multiple tiles
Michael Niedermayer [Sun, 14 Jun 2015 19:05:38 +0000 (21:05 +0200)]
avcodec/jpeg2000: Fix regression with multiple tiles

Fixes Ticket 4624

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Change codeblock coords to same origin as bands
Michael Niedermayer [Sun, 14 Jun 2015 18:02:06 +0000 (20:02 +0200)]
avcodec/jpeg2000: Change codeblock coords to same origin as bands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Change precinct coords to same origin as bands
Michael Niedermayer [Sun, 14 Jun 2015 17:53:39 +0000 (19:53 +0200)]
avcodec/jpeg2000: Change precinct coords to same origin as bands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Fix band coords
Michael Niedermayer [Sun, 14 Jun 2015 17:43:08 +0000 (19:43 +0200)]
avcodec/jpeg2000: Fix band coords

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Print warning if the mqc pointer mismatches at the end
Michael Niedermayer [Sun, 14 Jun 2015 19:19:40 +0000 (21:19 +0200)]
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>
4 years agotls_gnutls: fix hang on disconnection
wm4 [Sat, 13 Jun 2015 21:55:21 +0000 (23:55 +0200)]
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>
4 years agoavcodec/jpeg2000dec: Show the progression order at debug level for all variants
Michael Niedermayer [Sun, 14 Jun 2015 17:43:38 +0000 (19:43 +0200)]
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>
4 years agoavfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMIN
Paul B Mahol [Sun, 14 Jun 2015 17:08:43 +0000 (17:08 +0000)]
avfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMIN

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agotls_gnutls: fix hang on disconnection
wm4 [Sun, 14 Jun 2015 15:12:53 +0000 (17:12 +0200)]
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>
4 years agoavcodec/jpeg2000dec: Print error messages for more error conditions
Michael Niedermayer [Sun, 14 Jun 2015 13:00:45 +0000 (15:00 +0200)]
avcodec/jpeg2000dec: Print error messages for more error conditions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: fix spelling errors
Andreas Cadhalpun [Sat, 13 Jun 2015 19:34:40 +0000 (21:34 +0200)]
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>
4 years agoavcodec/jpeg2000dec: Handle format that has planes matching YUVA420P structure but...
Michael Niedermayer [Sun, 14 Jun 2015 02:45:02 +0000 (04:45 +0200)]
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>
4 years agoavcodec/jpeg2000dec: Print all cdx/cdy values not just the 2nd and 3rd
Michael Niedermayer [Sun, 14 Jun 2015 02:44:33 +0000 (04:44 +0200)]
avcodec/jpeg2000dec: Print all cdx/cdy values not just the 2nd and 3rd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: bump minor after colorkey addition
Clément Bœsch [Sun, 14 Jun 2015 09:20:42 +0000 (11:20 +0200)]
avfilter: bump minor after colorkey addition

4 years agoavcodec/hevc: Track long and short term RPS size for VDPAU
Philip Langdale [Sat, 13 Jun 2015 16:34:43 +0000 (09:34 -0700)]
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>
4 years agoavcodec/nvenc: Enable YV12 input format
Philip Langdale [Sun, 7 Jun 2015 03:28:22 +0000 (20:28 -0700)]
avcodec/nvenc: Enable YV12 input format

This has been enabled by recent nvidia driver releases.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoavcodec/jpeg2000dec: Implement "Reset context probabilities on coding pass boundaries"
Michael Niedermayer [Sun, 14 Jun 2015 01:28:07 +0000 (03:28 +0200)]
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>
4 years agosoftfloat: make av_div_sf() inline
James Almer [Sat, 13 Jun 2015 03:20:37 +0000 (00:20 -0300)]
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>
4 years agoavcodec/jpeg2000dec: Support RPCL
Michael Niedermayer [Sun, 14 Jun 2015 00:41:53 +0000 (02:41 +0200)]
avcodec/jpeg2000dec: Support RPCL

Fixes Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_colorkey: Add colorkey video filter
Timo Rothenpieler [Sat, 13 Jun 2015 13:09:07 +0000 (15:09 +0200)]
avfilter/vf_colorkey: Add colorkey video filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/singlejpeg: fix standalone compilation
James Almer [Sat, 13 Jun 2015 20:47:13 +0000 (17:47 -0300)]
avformat/singlejpeg: fix standalone compilation

4 years agoavcodec/jpeg200dsp: add ff_rct_int_{sse2,avx2}
James Almer [Sat, 13 Jun 2015 16:13:10 +0000 (13:13 -0300)]
avcodec/jpeg200dsp: add ff_rct_int_{sse2,avx2}

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/jpeg200dsp: add ff_ict_float_{sse,avx}
James Almer [Sat, 13 Jun 2015 16:11:51 +0000 (13:11 -0300)]
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>
4 years agoavfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_co...
Michael Niedermayer [Fri, 12 Jun 2015 21:40:09 +0000 (23:40 +0200)]
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>
4 years agoavfilter/lut3d: assert on pixel format descriptor
Clément Bœsch [Sat, 13 Jun 2015 18:49:42 +0000 (20:49 +0200)]
avfilter/lut3d: assert on pixel format descriptor

inlink->format is supposed to be set to a valid format controlled by query_formats().

4 years agoavfilter/geq: assert on pixel format descriptor
Clément Bœsch [Sat, 13 Jun 2015 18:49:32 +0000 (20:49 +0200)]
avfilter/geq: assert on pixel format descriptor

inlink->format is supposed to be set to a valid format controlled by query_formats().

4 years agoconfigure: only disable VSX for !ppc64el
Andreas Cadhalpun [Sat, 13 Jun 2015 11:09:21 +0000 (13:09 +0200)]
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>
4 years agoavcodec/ass_split: check ASSSplitContext alloc
Clément Bœsch [Sat, 13 Jun 2015 18:39:57 +0000 (20:39 +0200)]
avcodec/ass_split: check ASSSplitContext alloc

4 years agoavcodec/jpeg2000dec: Support PCRL
Michael Niedermayer [Sat, 13 Jun 2015 11:56:23 +0000 (13:56 +0200)]
avcodec/jpeg2000dec: Support PCRL

Fixes Ticket4603

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Try to fix remaining DCinema hardcoded TODOs in CPRL
Michael Niedermayer [Sat, 13 Jun 2015 11:22:05 +0000 (13:22 +0200)]
avcodec/jpeg2000dec: Try to fix remaining DCinema hardcoded TODOs in CPRL

Again, no testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: try to correct tile location in CPRL code
Michael Niedermayer [Sat, 13 Jun 2015 10:58:45 +0000 (12:58 +0200)]
avcodec/jpeg2000dec: try to correct tile location in CPRL code

No testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Factorize component out of CPRL loop
Michael Niedermayer [Sat, 13 Jun 2015 10:38:49 +0000 (12:38 +0200)]
avcodec/jpeg2000dec: Factorize component out of CPRL loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Fix x/y step TODO for CPRL
Michael Niedermayer [Sat, 13 Jun 2015 10:19:22 +0000 (12:19 +0200)]
avcodec/jpeg2000dec: Fix x/y step TODO for CPRL

No testcase known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRemove a few occurences of "long long" from the libraries.
Carl Eugen Hoyos [Sat, 13 Jun 2015 07:28:41 +0000 (09:28 +0200)]
Remove a few occurences of "long long" from the libraries.

4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions
Shivraj Patil [Thu, 11 Jun 2015 06:01:12 +0000 (11:31 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions in new file h264qpel_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Added const to local static array.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoexamples/decoding_encoding: Use the AVFrame width/height for processing images after...
Michael Niedermayer [Wed, 10 Jun 2015 20:00:30 +0000 (22:00 +0200)]
examples/decoding_encoding: Use the AVFrame width/height for processing images after decoding

This is what FFmpeg / FFplay do and it is more robust

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: check av_asprintf() for failure
Michael Niedermayer [Fri, 12 Jun 2015 23:08:16 +0000 (01:08 +0200)]
ffprobe: check av_asprintf() for failure

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/smvjpegdec: assert that the pixel format that has been set by our decoder...
Michael Niedermayer [Fri, 12 Jun 2015 22:27:21 +0000 (00:27 +0200)]
avcodec/smvjpegdec: assert that the pixel format that has been set by our decoder is valid

If we do check av_pix_fmt_desc_get() then we should fail and
not continue with an invalid pix_fmt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/drawutils: Fix format validity check in ff_draw_init()
Michael Niedermayer [Fri, 12 Jun 2015 22:06:28 +0000 (00:06 +0200)]
avfilter/drawutils: Fix format validity check in ff_draw_init()

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/imgutils: Simplify pix_fmt validity check in av_image_get_linesize()
Michael Niedermayer [Fri, 12 Jun 2015 21:23:59 +0000 (23:23 +0200)]
avutil/imgutils: Simplify pix_fmt validity check in av_image_get_linesize()

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d'
Michael Niedermayer [Fri, 12 Jun 2015 21:11:15 +0000 (23:11 +0200)]
Merge commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d'

* commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d':
  fft-test: Use the float fabs() version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd'
Michael Niedermayer [Fri, 12 Jun 2015 21:03:12 +0000 (23:03 +0200)]
Merge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd'

* commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd':
  on2avc: Use the integer abs() version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'
Michael Niedermayer [Fri, 12 Jun 2015 20:55:49 +0000 (22:55 +0200)]
Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'

* commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91':
  flv: Name an enum and use its type

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d'
Michael Niedermayer [Fri, 12 Jun 2015 20:45:53 +0000 (22:45 +0200)]
Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d'

* commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d':
  cws2fws: Close file handles on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'
Michael Niedermayer [Fri, 12 Jun 2015 20:34:53 +0000 (22:34 +0200)]
Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'

* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
  avconv_opt: Check localtime() return value

Conflicts:
ffmpeg_opt.c

See: 8e91d9652ea5048d9014e7636e12c6ed4732d7b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'
Michael Niedermayer [Fri, 12 Jun 2015 20:10:34 +0000 (22:10 +0200)]
Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'

* commit '8a78ae2d2101622fd244b99178d8bc61175c878e':
  segment: Check open_null_ctx() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb'
Michael Niedermayer [Fri, 12 Jun 2015 19:55:24 +0000 (21:55 +0200)]
Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb'

* commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb':
  h264_qpel: Use the correct header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'
Michael Niedermayer [Fri, 12 Jun 2015 19:44:33 +0000 (21:44 +0200)]
Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'

* commit '5e87080f2c73186066df0b9c43877b4af0beef3a':
  h264_weight: Fix SSSE3 biweight code with weights of 128

Conflicts:
libavcodec/x86/h264_weight.asm

See: e1009665759d4a3938dd2dd07b7e84d8bc9c5290
See: fb2288834ba8a51e8934cfe8b82ac468144a34df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '64a2e844166d62093b45e680874eea8bd1facf5b'
Michael Niedermayer [Fri, 12 Jun 2015 19:42:36 +0000 (21:42 +0200)]
Merge commit '64a2e844166d62093b45e680874eea8bd1facf5b'

* commit '64a2e844166d62093b45e680874eea8bd1facf5b':
  eamad: Use the correct headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8606e881b02bec2ac24943d22c8afe11d641fac8'
Michael Niedermayer [Fri, 12 Jun 2015 19:33:53 +0000 (21:33 +0200)]
Merge commit '8606e881b02bec2ac24943d22c8afe11d641fac8'

* commit '8606e881b02bec2ac24943d22c8afe11d641fac8':
  mpeg12: Move the vlc bits to a stand alone file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'
Michael Niedermayer [Fri, 12 Jun 2015 19:14:34 +0000 (21:14 +0200)]
Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'

* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
  mpegvideo: Expand macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: update avctx width/height/pix_fmt when returning frame
Andreas Cadhalpun [Tue, 9 Jun 2015 21:38:26 +0000 (23:38 +0200)]
h264: update avctx width/height/pix_fmt when returning frame

Inconsistencies between the dimensions/pixel format of avctx and the
frame can confuse API users.
For example this can crash the demuxing_decoding example.

Back up the previous values and restore them, when decoding the next
frame. This is necessary, because these can be different between the
returned frame and the last decoded frame.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoMerge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'
Michael Niedermayer [Fri, 12 Jun 2015 19:05:09 +0000 (21:05 +0200)]
Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'

* commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b':
  mpegvideo: rv10: Move function declaration to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
Michael Niedermayer [Fri, 12 Jun 2015 18:57:37 +0000 (20:57 +0200)]
Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'

* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
  mpegvideo: h263: Move all tables to a single file

Conflicts:
libavcodec/h263.h
libavcodec/h263data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'
Michael Niedermayer [Fri, 12 Jun 2015 18:47:14 +0000 (20:47 +0200)]
Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'

* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25':
  mpegvideo: Move ER functions to a separate file

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec/imgconvert.c: support left band while cropping
Przemysław Sobala [Fri, 12 Jun 2015 16:38:05 +0000 (18:38 +0200)]
libavcodec/imgconvert.c: support left band while cropping

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfdec: Detect jpeg2000 through codec_ul too
Michael Niedermayer [Fri, 12 Jun 2015 16:56:02 +0000 (18:56 +0200)]
avformat/mxfdec: Detect jpeg2000 through codec_ul too

Fixes Ticket2345

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: add one more zoompan example
Paul B Mahol [Fri, 12 Jun 2015 17:33:13 +0000 (17:33 +0000)]
doc/filters: add one more zoompan example

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agomatroskadec: verify seekhead IDs
wm4 [Fri, 12 Jun 2015 11:11:41 +0000 (13:11 +0200)]
matroskadec: verify seekhead IDs

Some files have SeekHead elements with broken IDs. They mismatch with
the ID of the destination element. These files are written by
"IDMmkvlib0.1" (as identified by the MuxingApp and WritingApp elements),
and the SeekHead IDs are actually endian-swapped.

This confuses the SeekHead logic of the demuxer. It will read some
elements twice, because the SeekHead ID is used to identify and remember
already read elements. With the file at hand, the stream list was
duplicated by reading the Tracks element twice.

Fix this by rejecting invalid EBML IDs in SeekHead entries. (This fix is
relatively specific to the broken file at hand, and doesn't protect
against some other cases of broken SeekHead, such as valid but
mismatching target element IDs.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_zoompan: support planar rgb pixel formats
Paul B Mahol [Fri, 12 Jun 2015 17:14:08 +0000 (17:14 +0000)]
avfilter/vf_zoompan: support planar rgb pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agofft-test: Use the float fabs() version
Vittorio Giovara [Fri, 12 Jun 2015 16:04:20 +0000 (17:04 +0100)]
fft-test: Use the float fabs() version

Fixes clang warning "absolute value function 'fabsf' given an argument
of type 'double' but has parameter of type 'float' which may cause
truncation of value [-Wabsolute-value]".

4 years agoon2avc: Use the integer abs() version
Vittorio Giovara [Fri, 12 Jun 2015 11:32:38 +0000 (12:32 +0100)]
on2avc: Use the integer abs() version

Fixes clang warning "floating point absolute value function 'fabsf'
when argument is of integer type [-Wabsolute-value]".

4 years agoflv: Name an enum and use its type
Vittorio Giovara [Thu, 11 Jun 2015 13:27:27 +0000 (14:27 +0100)]
flv: Name an enum and use its type

4 years agocws2fws: Close file handles on error
Vittorio Giovara [Fri, 12 Jun 2015 13:01:22 +0000 (14:01 +0100)]
cws2fws: Close file handles on error

Reported-By: infer
4 years agoavconv_opt: Check localtime() return value
Vittorio Giovara [Fri, 12 Jun 2015 12:39:17 +0000 (13:39 +0100)]
avconv_opt: Check localtime() return value

Reported-By: infer
4 years agosegment: Check open_null_ctx() return value
Vittorio Giovara [Fri, 12 Jun 2015 12:39:16 +0000 (13:39 +0100)]
segment: Check open_null_ctx() return value

Reported-By: infer
4 years agoh264_qpel: Use the correct header
Vittorio Giovara [Fri, 12 Jun 2015 11:29:07 +0000 (12:29 +0100)]
h264_qpel: Use the correct header

4 years agoh264_weight: Fix SSSE3 biweight code with weights of 128
Michael Niedermayer [Fri, 12 Jun 2015 11:58:42 +0000 (12:58 +0100)]
h264_weight: Fix SSSE3 biweight code with weights of 128

CC: libav-stable@libav.org
Sample-Id: test_bref.mp4

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavcodec/jpeg2000dec: Reduce verbosity of get_plt()
Michael Niedermayer [Fri, 12 Jun 2015 14:48:57 +0000 (16:48 +0200)]
avcodec/jpeg2000dec: Reduce verbosity of get_plt()

The existence of such element does not represent an error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Fallback to yuv if no matching xyz format exists
Michael Niedermayer [Fri, 12 Jun 2015 14:28:53 +0000 (16:28 +0200)]
avcodec/jpeg2000dec: Fallback to yuv if no matching xyz format exists

Fixes Ticket4471

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Do not abort if prc is outside limits
Michael Niedermayer [Fri, 12 Jun 2015 14:26:27 +0000 (16:26 +0200)]
avcodec/jpeg2000dec: Do not abort if prc is outside limits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Check for localtime() failure
Michael Niedermayer [Fri, 12 Jun 2015 13:36:20 +0000 (15:36 +0200)]
ffmpeg_opt: Check for localtime() failure

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMark vectors as NAN instead of dereferencing NULL pointers on malloc failure
Michael Niedermayer [Fri, 12 Jun 2015 13:03:49 +0000 (15:03 +0200)]
Mark vectors as NAN instead of dereferencing NULL pointers on malloc failure

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale: Assert that pixel format descriptor is not NULL
Michael Niedermayer [Fri, 12 Jun 2015 12:39:28 +0000 (14:39 +0200)]
swscale: Assert that pixel format descriptor is not NULL

This may help static analyzers, the pixel format is checked
during initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Assert that pixel format descriptor is not NULL
Michael Niedermayer [Fri, 12 Jun 2015 12:33:53 +0000 (14:33 +0200)]
avcodec/jpeg2000dec: Assert that pixel format descriptor is not NULL

We only look up pixel formats from a fixed list so none should ever
fail to be found

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: recognizes and export private streams
Michael Niedermayer [Thu, 4 Jun 2015 21:46:21 +0000 (23:46 +0200)]
avformat/mpegts: recognizes and export private streams

Based on patch by Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Disable VSX on unspecified / generic CPUs
Michael Niedermayer [Fri, 12 Jun 2015 11:20:25 +0000 (13:20 +0200)]
configure: Disable VSX on unspecified / generic CPUs

Fixes fate tests on PPC64be

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoeamad: Use the correct headers
Luca Barbato [Wed, 10 Jun 2015 13:29:09 +0000 (14:29 +0100)]
eamad: Use the correct headers

Untangle eamad from the mpeg12.h header and speed up rebuilding.

4 years agompeg12: Move the vlc bits to a stand alone file
Luca Barbato [Wed, 10 Jun 2015 13:29:08 +0000 (14:29 +0100)]
mpeg12: Move the vlc bits to a stand alone file

4 years agompegvideo: Expand macro
Vittorio Giovara [Wed, 10 Jun 2015 13:29:07 +0000 (14:29 +0100)]
mpegvideo: Expand macro

Having this macro in an header only facilitates the use of such header.
The code increase is minimal and files have one less dependency
on mpegvideo.h.

4 years agompegvideo: rv10: Move function declaration to a separate header
Vittorio Giovara [Wed, 10 Jun 2015 13:29:06 +0000 (14:29 +0100)]
mpegvideo: rv10: Move function declaration to a separate header

4 years agompegvideo: h263: Move all tables to a single file
Vittorio Giovara [Wed, 10 Jun 2015 13:29:05 +0000 (14:29 +0100)]
mpegvideo: h263: Move all tables to a single file

4 years agompegvideo: Move ER functions to a separate file
Vittorio Giovara [Wed, 10 Jun 2015 13:29:04 +0000 (14:29 +0100)]
mpegvideo: Move ER functions to a separate file

4 years agoavcodec/jpeg2000dec: Do not hardcode tile part usage
Michael Niedermayer [Fri, 12 Jun 2015 02:35:18 +0000 (04:35 +0200)]
avcodec/jpeg2000dec: Do not hardcode tile part usage

Fixes part of Ticket 4605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Do not print a warning for RLCP
Michael Niedermayer [Fri, 12 Jun 2015 02:36:38 +0000 (04:36 +0200)]
avcodec/jpeg2000dec: Do not print a warning for RLCP

It seems to be working now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Remove unused variable and argument
Michael Niedermayer [Fri, 12 Jun 2015 01:33:31 +0000 (03:33 +0200)]
avcodec/jpeg2000dec: Remove unused variable and argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Fix Selective arithmetic coding bypass and Multiple codeword...
Michael Niedermayer [Fri, 12 Jun 2015 01:06:56 +0000 (03:06 +0200)]
avcodec/jpeg2000dec: Fix Selective arithmetic coding bypass and Multiple codeword segments

These 2 are highly related so they are in the same commit
Fixes part of Ticket4605
Fixes p0_04.j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mqcdec: Support raw bypass and non reseting init
Michael Niedermayer [Fri, 12 Jun 2015 01:02:09 +0000 (03:02 +0200)]
avcodec/mqcdec: Support raw bypass and non reseting init

Some broken code that used the old mqc is removed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: add some sanity checking on newpasses
Michael Niedermayer [Fri, 12 Jun 2015 00:02:04 +0000 (02:02 +0200)]
avcodec/jpeg2000dec: add some sanity checking on newpasses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Add some additional checking on lengthinc
Michael Niedermayer [Thu, 11 Jun 2015 23:13:55 +0000 (01:13 +0200)]
avcodec/jpeg2000dec: Add some additional checking on lengthinc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Print warning for "Selective arithmetic coding bypass"
Michael Niedermayer [Thu, 11 Jun 2015 20:33:53 +0000 (22:33 +0200)]
avcodec/jpeg2000dec: Print warning for "Selective arithmetic coding bypass"

This is implemented but i suspect does not work correctly as no file using this
seems to decode correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Implement progression order RLCP
Michael Niedermayer [Thu, 11 Jun 2015 19:10:44 +0000 (21:10 +0200)]
avcodec/jpeg2000dec: Implement progression order RLCP

This works with one of 2 RLCP samples i have, the other appears to also
use selective arithemtic coding bypass which may or may not be the reason why it does
not work

Sample: p0_16.j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>