ffmpeg.git
5 years agoh2645_parse: support badly muxed mp4 streams
Hendrik Leppkes [Thu, 12 May 2016 10:07:40 +0000 (12:07 +0200)]
h2645_parse: support badly muxed mp4 streams

Some streams contain an additional AnnexB NAL inside the mp4/nalff NALU.
This commonly occurs in interlaced streams where both fields are packed
into the same MP4 NAL with an AnnexB startcode in between.

Port handling of this format from the previous h264 nal handling.

Fixes trac #5529

5 years agoavcodec/iff: fix artifacts with uncompressed ham ANIMs
Paul B Mahol [Tue, 17 May 2016 09:01:02 +0000 (11:01 +0200)]
avcodec/iff: fix artifacts with uncompressed ham ANIMs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/mips/h264dsp_mmi: Version 2 of the optimizations for loongson mmi
ZhouXiaoyong [Fri, 13 May 2016 10:03:27 +0000 (18:03 +0800)]
avcodec/mips/h264dsp_mmi: Version 2 of the optimizations for loongson mmi

1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. optimize some unaligned loads and stores
4. use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/dtshddec: implement AUPR_HDR chunk parsing
James Almer [Mon, 16 May 2016 18:45:22 +0000 (15:45 -0300)]
avformat/dtshddec: implement AUPR_HDR chunk parsing

Use it to get stream duration, sample rate, channel count and initial padding

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavformat/dtshddec: parse chunks stored after audio data
James Almer [Mon, 16 May 2016 05:13:46 +0000 (02:13 -0300)]
avformat/dtshddec: parse chunks stored after audio data

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/iff: add support for ANIMs with keyframes and concatenated ANIMs
Paul B Mahol [Mon, 16 May 2016 20:39:03 +0000 (22:39 +0200)]
avcodec/iff: add support for ANIMs with keyframes and concatenated ANIMs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/iff: check if there is enough bytes left
Paul B Mahol [Mon, 16 May 2016 13:37:24 +0000 (15:37 +0200)]
avcodec/iff: check if there is enough bytes left

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/utils: Do not compute the bitrate from duration == 0
Michael Niedermayer [Mon, 16 May 2016 11:43:02 +0000 (13:43 +0200)]
avformat/utils: Do not compute the bitrate from duration == 0

Fixes division by 0 in fate-acodec-ra144

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoffmpeg: Check that r_frame_rate is set before attempting to use it
Michael Niedermayer [Mon, 16 May 2016 10:49:06 +0000 (12:49 +0200)]
ffmpeg: Check that r_frame_rate is set before attempting to use it

Avoids unexpected occurance and dependency on NaN behavior and divisions by 0

Testcase: fate-lavf-fate-avi_cram

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoswresample/resample: Fix division by 0 with tap_count=1
Michael Niedermayer [Mon, 16 May 2016 03:10:21 +0000 (05:10 +0200)]
swresample/resample: Fix division by 0 with tap_count=1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoswresample/rematrix: Use clipping s16 rematrixing if overflows are possible
Michael Niedermayer [Sun, 15 May 2016 19:34:37 +0000 (21:34 +0200)]
swresample/rematrix: Use clipping s16 rematrixing if overflows are possible

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/adxdec: set bit_rate, fixes duration calculation
Paul B Mahol [Sun, 15 May 2016 17:02:12 +0000 (19:02 +0200)]
avformat/adxdec: set bit_rate, fixes duration calculation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoswresample/rematrix: Use error diffusion to avoid error in the DC component of the...
Michael Niedermayer [Sun, 15 May 2016 16:33:09 +0000 (18:33 +0200)]
swresample/rematrix: Use error diffusion to avoid error in the DC component of the matrix

This fixes the sum of the integer coefficients ending up summing to a value
larger than the value representing unity.

This issue occurs with qN0.dts when converting to stereo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/dsd: Fix "warning: ctables defined but not used [-Wunused-variable]"
Michael Niedermayer [Sun, 15 May 2016 12:34:44 +0000 (14:34 +0200)]
avcodec/dsd: Fix "warning: ctables defined but not used [-Wunused-variable]"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/iff: rewrite out of bounds checking in writer
Paul B Mahol [Sun, 15 May 2016 14:33:33 +0000 (16:33 +0200)]
avcodec/iff: rewrite out of bounds checking in writer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/dstdec: Fix "warning: initialization from incompatible pointer type [enabled...
Michael Niedermayer [Sun, 15 May 2016 02:28:31 +0000 (04:28 +0200)]
avcodec/dstdec: Fix "warning: initialization from incompatible pointer type [enabled by default]"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agodoc/general: update supported DCA extensions
James Almer [Sun, 15 May 2016 02:00:12 +0000 (23:00 -0300)]
doc/general: update supported DCA extensions

5 years agohevc: Fix memory leak related to a53_caption data
Will Kelleher [Thu, 7 Apr 2016 13:58:31 +0000 (08:58 -0500)]
hevc: Fix memory leak related to a53_caption data

Signed-off-by: Will Kelleher <wkelleher@gogoair.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agodoc/general: mention DST decoder
Paul B Mahol [Sat, 14 May 2016 23:25:12 +0000 (01:25 +0200)]
doc/general: mention DST decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agodoc/general: mention WSD demuxer
Paul B Mahol [Sat, 14 May 2016 23:22:36 +0000 (01:22 +0200)]
doc/general: mention WSD demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/escape124: change transitions table type to int8_t
Paul B Mahol [Sat, 14 May 2016 23:17:02 +0000 (01:17 +0200)]
avcodec/escape124: change transitions table type to int8_t

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec: bump minor and update Changelog for recent DST addition
Paul B Mahol [Sat, 14 May 2016 23:19:12 +0000 (01:19 +0200)]
avcodec: bump minor and update Changelog for recent DST addition

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec: add Direct Stream Transfer (DST) decoder
Peter Ross [Thu, 5 May 2016 19:21:27 +0000 (21:21 +0200)]
avcodec: add Direct Stream Transfer (DST) decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/dca: print error message when no frame is found in packet
foo86 [Fri, 13 May 2016 09:48:25 +0000 (12:48 +0300)]
avcodec/dca: print error message when no frame is found in packet

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/iff: check for end of buffer in input for delta_l decompression
Paul B Mahol [Sat, 14 May 2016 12:29:59 +0000 (14:29 +0200)]
avcodec/iff: check for end of buffer in input for delta_l decompression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavutil/mips: header asmdefs.h add some PTR_ macros for loongson
ZhouXiaoyong [Fri, 13 May 2016 10:02:28 +0000 (18:02 +0800)]
avutil/mips: header asmdefs.h add some PTR_ macros for loongson

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavutil/lzo: split test out into a separate file
James Almer [Sat, 14 May 2016 01:48:56 +0000 (22:48 -0300)]
avutil/lzo: split test out into a separate file

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/iff: implement 3rd delta ANIM decompression
Paul B Mahol [Thu, 12 May 2016 21:54:26 +0000 (23:54 +0200)]
avcodec/iff: implement 3rd delta ANIM decompression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/Makefile: fix avlanguage dependencies
James Almer [Fri, 13 May 2016 20:19:56 +0000 (17:19 -0300)]
avformat/Makefile: fix avlanguage dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavutil/sha512-test: fix memleak
James Almer [Fri, 13 May 2016 19:53:44 +0000 (16:53 -0300)]
avutil/sha512-test: fix memleak

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavutil/sha-test: fix memleak
James Almer [Fri, 13 May 2016 19:53:26 +0000 (16:53 -0300)]
avutil/sha-test: fix memleak

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavutil/ripemd-test: fix memleak
James Almer [Fri, 13 May 2016 19:53:18 +0000 (16:53 -0300)]
avutil/ripemd-test: fix memleak

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavutil/aes-test: fix memleak
James Almer [Fri, 13 May 2016 19:53:08 +0000 (16:53 -0300)]
avutil/aes-test: fix memleak

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoswresample/arm: add ff_resample_common_apply_filter_{x4,x8}_{float,s16}_neon
Matthieu Bouron [Sun, 8 May 2016 18:56:03 +0000 (18:56 +0000)]
swresample/arm: add ff_resample_common_apply_filter_{x4,x8}_{float,s16}_neon

5 years agoavcodec/iff: change delta l offset to uint32_t
Paul B Mahol [Fri, 13 May 2016 12:01:12 +0000 (14:01 +0200)]
avcodec/iff: change delta l offset to uint32_t

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/avpacket: Respect payload offset in av_packet_ref
Andriy Lysnevych [Thu, 12 May 2016 14:47:09 +0000 (17:47 +0300)]
avcodec/avpacket: Respect payload offset in av_packet_ref

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/dump.c: fix mixed log levels
Tobias Rapp [Thu, 12 May 2016 08:26:03 +0000 (10:26 +0200)]
avformat/dump.c: fix mixed log levels

Previously a partial log message without newline was printed in case of
loglevel=warning.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agolavc: add IFF ANIM decoder
Paul B Mahol [Tue, 10 May 2016 21:48:50 +0000 (23:48 +0200)]
lavc: add IFF ANIM decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge commit 'f3ed484953b81856e40239d2410058a96188b2be'
Derek Buitenhuis [Thu, 12 May 2016 13:33:57 +0000 (14:33 +0100)]
Merge commit 'f3ed484953b81856e40239d2410058a96188b2be'

* commit 'f3ed484953b81856e40239d2410058a96188b2be':
  h264_mp4toannexb_bsf: do not fail on annex B extradata

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoape: Unbreak adaptcoeffs computation
Luca Barbato [Thu, 21 Apr 2016 14:09:38 +0000 (16:09 +0200)]
ape: Unbreak adaptcoeffs computation

And simplify and explain the expression.

Fault introduced in f3fdef108eb06b1e71b29152bf6822519e787efe

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'
Derek Buitenhuis [Thu, 12 May 2016 13:29:28 +0000 (14:29 +0100)]
Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'

* commit '5fca95c8e515a5ae542d9626ec088bdfc658450e':
  libx264: Forbid inverted Stereo3D mode

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '9e2af0e9071a1229cfe21efff394691d91f979b2'
Derek Buitenhuis [Thu, 12 May 2016 13:29:04 +0000 (14:29 +0100)]
Merge commit '9e2af0e9071a1229cfe21efff394691d91f979b2'

* commit '9e2af0e9071a1229cfe21efff394691d91f979b2':
  libx264: Allow Stereo3D monoscopic value

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6'
Derek Buitenhuis [Thu, 12 May 2016 13:28:17 +0000 (14:28 +0100)]
Merge commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6'

* commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6':
  build: Silence the lcov-reset target

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '75b90ef722b7cdfc70118ab987e298d087aae693'
Derek Buitenhuis [Thu, 12 May 2016 13:27:49 +0000 (14:27 +0100)]
Merge commit '75b90ef722b7cdfc70118ab987e298d087aae693'

* commit '75b90ef722b7cdfc70118ab987e298d087aae693':
  libavformat: Update the comment about AVOutputFormat flags

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '74383def8f46805faf3391c98516b248108a9a6b'
Derek Buitenhuis [Thu, 12 May 2016 13:27:30 +0000 (14:27 +0100)]
Merge commit '74383def8f46805faf3391c98516b248108a9a6b'

* commit '74383def8f46805faf3391c98516b248108a9a6b':
  movenc: Handle pts == NOPTS when autoflushing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da'
Derek Buitenhuis [Thu, 12 May 2016 13:26:55 +0000 (14:26 +0100)]
Merge commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da'

* commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da':
  movenc: Update a comment to reflect how the code actually behaves

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89'
Derek Buitenhuis [Thu, 12 May 2016 13:25:04 +0000 (14:25 +0100)]
Merge commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89'

This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.

* commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89':
  img2enc: Refactor the atomic renaming code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'f3fdef108eb06b1e71b29152bf6822519e787efe'
Derek Buitenhuis [Thu, 12 May 2016 13:20:51 +0000 (14:20 +0100)]
Merge commit 'f3fdef108eb06b1e71b29152bf6822519e787efe'

* commit 'f3fdef108eb06b1e71b29152bf6822519e787efe':
  ape: Avoid undefined behaviour

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5'
Derek Buitenhuis [Thu, 12 May 2016 13:18:41 +0000 (14:18 +0100)]
Merge commit '6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5'

This commit is a no-op.

* commit '6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5':
  indeo3: Avoid undefined behaviour

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f'
Derek Buitenhuis [Thu, 12 May 2016 13:17:57 +0000 (14:17 +0100)]
Merge commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f'

* commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f':
  libxvid: Create extradata in init using a dummy frame

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b'
Derek Buitenhuis [Thu, 12 May 2016 13:17:08 +0000 (14:17 +0100)]
Merge commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b'

* commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b':
  pixfmt: fix wrong comment

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'
Derek Buitenhuis [Thu, 12 May 2016 13:04:02 +0000 (14:04 +0100)]
Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'

* commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477':
  Generate the lists of enabled protocols/bsfs from configure.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolavc/libutvideoenc: Cast an unsigned constant to int.
Carl Eugen Hoyos [Thu, 12 May 2016 07:07:02 +0000 (09:07 +0200)]
lavc/libutvideoenc: Cast an unsigned constant to int.

Fixes the following warning / error:
libavcodec/libutvideoenc.cpp:281:1: warning: narrowing conversion of ‘3221258240u’ from ‘unsigned int’ to ‘int’ inside { } is ill-formed in C++11 [-Wnarrowing]

Fixes ticket #5542.

5 years agoavutil/cpu-test: Fix includes (needed for HAVE_*)
James Almer [Wed, 11 May 2016 20:03:21 +0000 (22:03 +0200)]
avutil/cpu-test: Fix includes (needed for HAVE_*)

Commit message by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavutil/float_dsp-test: Add include config.h for HAVE_*
Michael Niedermayer [Wed, 11 May 2016 20:03:03 +0000 (22:03 +0200)]
avutil/float_dsp-test: Add include config.h for HAVE_*

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavutil: make crypto testprogs include headers only
James Almer [Wed, 11 May 2016 21:16:56 +0000 (18:16 -0300)]
avutil: make crypto testprogs include headers only

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoSplit drawutils test out into separate file
Derek Buitenhuis [Wed, 11 May 2016 19:43:19 +0000 (20:43 +0100)]
Split drawutils test out into separate file

This was missed during 96d616052b3d39678e477fa10610ca688f46fff9 because
it is not included in FATE.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavfft-test: Add missing mem.h include
Derek Buitenhuis [Wed, 11 May 2016 19:42:55 +0000 (20:42 +0100)]
avfft-test: Add missing mem.h include

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolossless audio dsp: unroll
Christophe Gisquet [Sun, 1 May 2016 13:33:47 +0000 (15:33 +0200)]
lossless audio dsp: unroll

The loops are guaranteed to be at least multiples of 8, so this
unrolling is safe but allows exploiting execution ports.

For int32 version: 68 -> 58c.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/dca_lbr: Fix "warning: missing braces around initializer"
Michael Niedermayer [Wed, 11 May 2016 16:49:57 +0000 (18:49 +0200)]
avcodec/dca_lbr: Fix "warning: missing braces around initializer"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoMerge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'
Derek Buitenhuis [Wed, 11 May 2016 18:46:13 +0000 (19:46 +0100)]
Merge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'

* commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5':
  hwcontext: initialize sw_format in av_hwframe_ctx_alloc()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'
Derek Buitenhuis [Wed, 11 May 2016 18:43:59 +0000 (19:43 +0100)]
Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'

* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
  lavc: move the vaapi encoders further down in the list of codecs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'
Derek Buitenhuis [Wed, 11 May 2016 18:40:30 +0000 (19:40 +0100)]
Merge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'

These are all trivial to merge.

* commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12':
  vaapi_h265: Add -qp option, use it to replace use of -global_quality
  vaapi_h265: Add constant-bitrate encode support
  vaapi_h264: Add encode quality option (for quality-speed tradeoff)
  vaapi_h264: Add -qp option, use it to replace use of -global_quality
  vaapi_encode: Add support for codec-local options
  vaapi_h264: Add constant-bitrate encode support
  vaapi_encode: Refactor slightly to allow easier setting of global options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '18019f8cb9663dd1032c65aa453eaec18d641905'
Derek Buitenhuis [Wed, 11 May 2016 18:28:12 +0000 (19:28 +0100)]
Merge commit '18019f8cb9663dd1032c65aa453eaec18d641905'

* commit '18019f8cb9663dd1032c65aa453eaec18d641905':
  FATE: add an H.264 test with unescaped extradata
  FATE: add an H.264 test with invalid reference lists

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'
Derek Buitenhuis [Wed, 11 May 2016 18:26:18 +0000 (19:26 +0100)]
Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'

* commit '9d4d9be538faa537440fff37d3b7ecf322911a55':
  libavcodec: Document that encoders may use the framerate field in AVCodecContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '1bb56abb9b37bd208a66164339c92cad59b1087b'
Derek Buitenhuis [Wed, 11 May 2016 18:24:26 +0000 (19:24 +0100)]
Merge commit '1bb56abb9b37bd208a66164339c92cad59b1087b'

* commit '1bb56abb9b37bd208a66164339c92cad59b1087b':
  omx: Add support for zerocopy input of frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658'
Derek Buitenhuis [Wed, 11 May 2016 18:23:15 +0000 (19:23 +0100)]
Merge commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658'

* commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658':
  omx: Add support for broadcom OMX on raspberry pi

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'e8919ec486a5559fdcf366e347be0656d904a87f'
Derek Buitenhuis [Wed, 11 May 2016 18:19:05 +0000 (19:19 +0100)]
Merge commit 'e8919ec486a5559fdcf366e347be0656d904a87f'

* commit 'e8919ec486a5559fdcf366e347be0656d904a87f':
  libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf'
Derek Buitenhuis [Wed, 11 May 2016 18:15:06 +0000 (19:15 +0100)]
Merge commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf'

* commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf':
  mmaldec: Use imgutils.h for copying frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f'
Derek Buitenhuis [Wed, 11 May 2016 18:14:26 +0000 (19:14 +0100)]
Merge commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f'

* commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f':
  testprogs: Add missing libm.h includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
Derek Buitenhuis [Wed, 11 May 2016 18:10:10 +0000 (19:10 +0100)]
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'

* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13':
  build: Split test programs off into separate files

Some conversions done by: James Almer <jamrial@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/dca_lbr: explicitly initialize structs with zero
Hendrik Leppkes [Wed, 11 May 2016 14:34:57 +0000 (16:34 +0200)]
avcodec/dca_lbr: explicitly initialize structs with zero

This fixes build on MSVC and conforms to the usual init style used.

5 years agoMerge commit '330177b508420a553083df94f22cbd5142de0f4a'
Derek Buitenhuis [Wed, 11 May 2016 14:11:46 +0000 (15:11 +0100)]
Merge commit '330177b508420a553083df94f22cbd5142de0f4a'

* commit '330177b508420a553083df94f22cbd5142de0f4a':
  build: Group declarations for hw-accelerated de-/encoding separately

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/nvenc: Write buffPeriod/picTime SEI in both CBR modes
Timo Rothenpieler [Wed, 11 May 2016 09:52:25 +0000 (11:52 +0200)]
avcodec/nvenc: Write buffPeriod/picTime SEI in both CBR modes

5 years agoavcodec/nvenc: Generate bufferingPeriod/pictureTiming SEI
Timo Rothenpieler [Wed, 11 May 2016 08:34:31 +0000 (10:34 +0200)]
avcodec/nvenc: Generate bufferingPeriod/pictureTiming SEI

For some unknown reason enabling these causes propper CBR padding,
so as there are no known downsides just always enable them in CBR mode.

5 years agoaarch64/synth_filter: fix compilation
James Almer [Wed, 11 May 2016 02:33:12 +0000 (23:33 -0300)]
aarch64/synth_filter: fix compilation

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agolibavformat/oggdec: Free stream private when header parsing fails.
Chris Cunningham [Mon, 9 May 2016 22:27:29 +0000 (15:27 -0700)]
libavformat/oggdec: Free stream private when header parsing fails.

Leaking this private structure opens up the possibility that it may
be re-used when parsing later packets in the stream. This is
problematic if the later packets are not the same codec type (e.g.
private allocated during Vorbis parsing, but later packets are Opus
and the private is assumed to be the oggopus_private type in
opus_header()).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agolavfi/drawutils: support NV12 and NV21
Rodger Combs [Tue, 10 May 2016 01:52:06 +0000 (20:52 -0500)]
lavfi/drawutils: support NV12 and NV21

5 years agoavcodec/rscc: check input buffer size for deflate mode
James Almer [Wed, 11 May 2016 01:07:19 +0000 (22:07 -0300)]
avcodec/rscc: check input buffer size for deflate mode

Fixes overreads.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/dca: add DTS Express (LBR) decoder
foo86 [Sun, 1 May 2016 15:43:00 +0000 (18:43 +0300)]
avcodec/dca: add DTS Express (LBR) decoder

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavdevice/decklink_dec: Convert decklink input module to use codecpar
Felt, Patrick [Sun, 8 May 2016 04:02:24 +0000 (04:02 +0000)]
avdevice/decklink_dec: Convert decklink input module to use codecpar

There are still a couple of deprecated calls that I’m not sure what to do with.
They are both related to some logic around AVCodecContext.coded_frame.
I couldn’t find anywhere that really documented what that was, or where it was intended to move to.
I left the warnings on.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/utils: Check bps before using it in a shift in ff_get_pcm_codec_id()
Michael Niedermayer [Tue, 10 May 2016 22:00:52 +0000 (00:00 +0200)]
avformat/utils: Check bps before using it in a shift in ff_get_pcm_codec_id()

Fixes undefined shift
Fixes: usan_shift

Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/oggparseopus: Check that granule pos is within the supported range
Michael Niedermayer [Tue, 10 May 2016 21:12:58 +0000 (23:12 +0200)]
avformat/oggparseopus: Check that granule pos is within the supported range

Larger values would imply file durations of astronomic proportions and cause
overflows

Fixes integer overflow
Fixes: usan_int64_overflow

Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavfilter/delogo: Check that logo area is inside the picture
Jean Delvare [Tue, 10 May 2016 12:50:38 +0000 (14:50 +0200)]
avfilter/delogo: Check that logo area is inside the picture

We can only remove the logo if it is inside the picture. We need at
least one pixel around the logo area for interpolation.

Fixes ticket #5527 (Delogo crash with x=0 and/or y=0).

Signed-off-by: Jean Delvare <jdelvare@suse.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agovf_colorspace: don't enable passthrough if bitdepth doesn't match.
Ronald S. Bultje [Fri, 6 May 2016 16:26:55 +0000 (12:26 -0400)]
vf_colorspace: don't enable passthrough if bitdepth doesn't match.

Also check return value of av_frame_copy() in passthrough mode, so that
if a copy fails (as it did here, because bitdepth didn't match), the filter
doesn't return success, which would mean sending an uninitialized framebuffer
further down the filtergraph.

5 years agovf_colorspace: fix range order.
Ronald S. Bultje [Fri, 6 May 2016 15:58:49 +0000 (11:58 -0400)]
vf_colorspace: fix range order.

5 years agovf_colorspace: make whitepoint adaptation mode configurable.
Ronald S. Bultje [Fri, 6 May 2016 13:40:10 +0000 (09:40 -0400)]
vf_colorspace: make whitepoint adaptation mode configurable.

Also add von kries whitepoint adaptation, and add 'identity' to turn
whitepoint adaptation off.

5 years agofate: add matroska-remux test.
Ronald S. Bultje [Fri, 6 May 2016 13:27:13 +0000 (09:27 -0400)]
fate: add matroska-remux test.

This tests automatic insertion of the vp9_superframe BSF as well as
ensuring that the colorspace properties in the video header can be
modified when remuxing (-c:v copy).

5 years agoffmpeg: copy color properties in case of -c:v copy.
Ronald S. Bultje [Tue, 3 May 2016 19:20:48 +0000 (15:20 -0400)]
ffmpeg: copy color properties in case of -c:v copy.

I have no idea why the first hunk uses ost->enc_ctx, because as far as
I understand, that is never used in case of -c:v copy, but this code
block is only entered if encoding_needed=0, which means stream_copy=1.
My point being: review from someone that knows this really well would
be appreciated.

5 years agovf_colorspace: use enums for bpp/subsampling array indices.
Ronald S. Bultje [Fri, 6 May 2016 13:00:14 +0000 (09:00 -0400)]
vf_colorspace: use enums for bpp/subsampling array indices.

Also add some documentation for each function to colorspacedsp.h.

5 years agovf_colorspace: add const to yuv_stride[] argument in DSP functions.
Ronald S. Bultje [Fri, 6 May 2016 12:59:43 +0000 (08:59 -0400)]
vf_colorspace: add const to yuv_stride[] argument in DSP functions.

5 years agovf_colorspace: add floyd-steinberg dithering option to full conversion.
Ronald S. Bultje [Tue, 3 May 2016 17:53:17 +0000 (13:53 -0400)]
vf_colorspace: add floyd-steinberg dithering option to full conversion.

5 years agoavfilter/f_metadata: update print output header line format
Tobias Rapp [Mon, 9 May 2016 09:35:38 +0000 (11:35 +0200)]
avfilter/f_metadata: update print output header line format

Update print mode output header line format to be more consistent with
other log output of FFmpeg. The printf-modifiers have been inspired by
the showinfo filter.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavfilter/f_metadata: add pts_time to print output
Tobias Rapp [Mon, 9 May 2016 09:35:37 +0000 (11:35 +0200)]
avfilter/f_metadata: add pts_time to print output

This allows e.g. to correlate signalstats metadata to time position
without having to find out the filter chain timebase first.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoMerge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
Derek Buitenhuis [Mon, 9 May 2016 14:52:05 +0000 (15:52 +0100)]
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'

* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption
Przemysław Sobala [Mon, 9 May 2016 09:27:09 +0000 (11:27 +0200)]
libavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavfilter/vf_fps: set fps value boundaries
Przemysław Sobala [Mon, 9 May 2016 09:17:23 +0000 (11:17 +0200)]
avfilter/vf_fps: set fps value boundaries

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoMerge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'
Derek Buitenhuis [Sun, 8 May 2016 22:57:32 +0000 (23:57 +0100)]
Merge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'

* commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330':
  configure: cosmetics: Drop pointless end-of-line semicolons

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '00658253e237ab975ae2d384e02b5936781f103d'
Derek Buitenhuis [Sun, 8 May 2016 22:50:29 +0000 (23:50 +0100)]
Merge commit '00658253e237ab975ae2d384e02b5936781f103d'

* commit '00658253e237ab975ae2d384e02b5936781f103d':
  fate: Update DDS tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '22e49e6edead9c83696f20127988f659b952ce65'
Derek Buitenhuis [Sun, 8 May 2016 22:50:09 +0000 (23:50 +0100)]
Merge commit '22e49e6edead9c83696f20127988f659b952ce65'

* commit '22e49e6edead9c83696f20127988f659b952ce65':
  dds: Simplify postprocessing check

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>