ffmpeg.git
2 years agoMerge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'
James Almer [Tue, 4 Apr 2017 18:03:34 +0000 (15:03 -0300)]
Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'

* commit '286ab878bd39b56008035638227b3ecb8ec5bbb7':
  fate.sh: Allow setting other make flags for running tests

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'aa498c3183236a93206b4a0e8225b9db0660b50d'
James Almer [Tue, 4 Apr 2017 17:51:46 +0000 (14:51 -0300)]
Merge commit 'aa498c3183236a93206b4a0e8225b9db0660b50d'

* commit 'aa498c3183236a93206b4a0e8225b9db0660b50d':
  avpacket: fix leak on realloc in av_packet_add_side_data()

This commit is a noop, see 574929d8b6de32ae712fcca7ab09f01a3e4616be

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65'
James Almer [Tue, 4 Apr 2017 17:47:09 +0000 (14:47 -0300)]
Merge commit 'c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65'

* commit 'c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65':
  examples/decode_video: allocate the packet dynamically

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '728ea23cce07467b732f538c87c13da13dd6dcf3'
James Almer [Tue, 4 Apr 2017 17:41:23 +0000 (14:41 -0300)]
Merge commit '728ea23cce07467b732f538c87c13da13dd6dcf3'

* commit '728ea23cce07467b732f538c87c13da13dd6dcf3':
  examples/decode_video: switch to the new decoding API

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f78d360bba6dcfb585847a49a84e89c25950fbdb'
James Almer [Tue, 4 Apr 2017 17:34:52 +0000 (14:34 -0300)]
Merge commit 'f78d360bba6dcfb585847a49a84e89c25950fbdb'

* commit 'f78d360bba6dcfb585847a49a84e89c25950fbdb':
  examples/decode_video: use a parser for splitting the input

Merged-by: James Almer <jamrial@gmail.com>
2 years agodoc/examples/extract_mvs: re-indent after previous commit
Matthieu Bouron [Mon, 3 Apr 2017 14:32:50 +0000 (16:32 +0200)]
doc/examples/extract_mvs: re-indent after previous commit

2 years agodoc/examples/extract_mvs: make pkt local to the main function
Matthieu Bouron [Mon, 3 Apr 2017 14:15:58 +0000 (16:15 +0200)]
doc/examples/extract_mvs: make pkt local to the main function

2 years agodoc/examples/extract_mvs: switch to new decoding API
Matthieu Bouron [Mon, 3 Apr 2017 13:25:09 +0000 (15:25 +0200)]
doc/examples/extract_mvs: switch to new decoding API

2 years agoMerge commit '59ab9e8ba1df7e3347a4cd2bd56c32e74aede802'
Clément Bœsch [Tue, 4 Apr 2017 09:48:23 +0000 (11:48 +0200)]
Merge commit '59ab9e8ba1df7e3347a4cd2bd56c32e74aede802'

* commit '59ab9e8ba1df7e3347a4cd2bd56c32e74aede802':
  examples/encode_video: allocate the packet dynamically

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '5f102a9559099429826e84758b8b5182244c52db'
Clément Bœsch [Tue, 4 Apr 2017 09:44:45 +0000 (11:44 +0200)]
Merge commit '5f102a9559099429826e84758b8b5182244c52db'

* commit '5f102a9559099429826e84758b8b5182244c52db':
  examples/encode_video: switch to the new encoding API

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'fee0f1de2c6a9924acb74013436dbea8f2bd1ecb'
Clément Bœsch [Tue, 4 Apr 2017 09:40:34 +0000 (11:40 +0200)]
Merge commit 'fee0f1de2c6a9924acb74013436dbea8f2bd1ecb'

* commit 'fee0f1de2c6a9924acb74013436dbea8f2bd1ecb':
  examples/decode_audio: flush the decoder

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '9a38184a143a1560814b084aebe628f8df46e666'
Clément Bœsch [Tue, 4 Apr 2017 09:38:56 +0000 (11:38 +0200)]
Merge commit '9a38184a143a1560814b084aebe628f8df46e666'

* commit '9a38184a143a1560814b084aebe628f8df46e666':
  examples/decode_audio: allocate the packet dynamically

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '45a1ce2ff7688656aacd53c27de5815a7ec13afe'
Clément Bœsch [Tue, 4 Apr 2017 09:37:11 +0000 (11:37 +0200)]
Merge commit '45a1ce2ff7688656aacd53c27de5815a7ec13afe'

* commit '45a1ce2ff7688656aacd53c27de5815a7ec13afe':
  examples/decode_audio: handle planar audio now produced by the MP2 decoder

This commit is a noop, we use a simpler and more generic method to write
the samples.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '3d66717f7cb5555257244be8f5bce172ed3af7ac'
Clément Bœsch [Tue, 4 Apr 2017 09:33:04 +0000 (11:33 +0200)]
Merge commit '3d66717f7cb5555257244be8f5bce172ed3af7ac'

* commit '3d66717f7cb5555257244be8f5bce172ed3af7ac':
  examples/decode_audio: use the new audio decoding API

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '0946c754d99c05413e813ee515039adcf0f9232a'
Clément Bœsch [Tue, 4 Apr 2017 09:27:37 +0000 (11:27 +0200)]
Merge commit '0946c754d99c05413e813ee515039adcf0f9232a'

* commit '0946c754d99c05413e813ee515039adcf0f9232a':
  examples/decode_audio: use a parser for splitting the input

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoexamples/decode_audio: reduce the scope of 2 variables
Clément Bœsch [Tue, 4 Apr 2017 09:17:35 +0000 (11:17 +0200)]
examples/decode_audio: reduce the scope of 2 variables

2 years agolavc: add AV_ prefix to CODEC_CAP_DELAY in doxy
Clément Bœsch [Tue, 4 Apr 2017 07:58:29 +0000 (09:58 +0200)]
lavc: add AV_ prefix to CODEC_CAP_DELAY in doxy

2 years agolavc/mediacodecdec: set AV_CODEC_CAP_AVOID_PROBING capability
Matthieu Bouron [Tue, 4 Apr 2017 07:12:42 +0000 (09:12 +0200)]
lavc/mediacodecdec: set AV_CODEC_CAP_AVOID_PROBING capability

2 years agolavc/mediacodecdec: switch to AV_CODEC_CAP_DELAY
Matthieu Bouron [Tue, 4 Apr 2017 07:07:54 +0000 (09:07 +0200)]
lavc/mediacodecdec: switch to AV_CODEC_CAP_DELAY

2 years agostdatomic/win32: only include the lean windows headers to avoid conflicts
Hendrik Leppkes [Tue, 4 Apr 2017 07:33:23 +0000 (09:33 +0200)]
stdatomic/win32: only include the lean windows headers to avoid conflicts

2 years agodoc/muxers: fix default value for image2 option start_number.
Nicolas George [Mon, 3 Apr 2017 10:13:30 +0000 (12:13 +0200)]
doc/muxers: fix default value for image2 option start_number.

2 years agoffprobe: port to new decode API
wm4 [Thu, 30 Mar 2017 14:58:04 +0000 (16:58 +0200)]
ffprobe: port to new decode API

Not sure if it behaves ideally in presence of decoding errors.

2 years agotests/fate/filter-video: add owdenoise test
Thomas Turner [Sun, 2 Apr 2017 22:27:57 +0000 (15:27 -0700)]
tests/fate/filter-video: add owdenoise test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/mov: Check creation_time for overflow
Michael Niedermayer [Sat, 1 Apr 2017 17:18:36 +0000 (19:18 +0200)]
avformat/mov: Check creation_time for overflow

Fixes integer overflow
Fixes: 701640

Found-by: Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/Makefile: fix truehd encoder dependencies
James Almer [Mon, 3 Apr 2017 21:08:43 +0000 (18:08 -0300)]
avcodec/Makefile: fix truehd encoder dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavfilter/vf_pad: add aspect option
Paul B Mahol [Sun, 2 Apr 2017 20:07:04 +0000 (22:07 +0200)]
avfilter/vf_pad: add aspect option

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoMerge commit 'f27e262dbdea1991b22e08b639ac03e642a3482c'
Clément Bœsch [Mon, 3 Apr 2017 19:12:15 +0000 (21:12 +0200)]
Merge commit 'f27e262dbdea1991b22e08b639ac03e642a3482c'

* commit 'f27e262dbdea1991b22e08b639ac03e642a3482c':
  examples/encode_audio: switch to the new audio encoding API

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '44c9f374f188f92927b7a4aad2101289d446b814'
Clément Bœsch [Mon, 3 Apr 2017 19:10:07 +0000 (21:10 +0200)]
Merge commit '44c9f374f188f92927b7a4aad2101289d446b814'

* commit '44c9f374f188f92927b7a4aad2101289d446b814':
  examples/qsvdec: convert to the new decoding API

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '1dd2b6c91ca5f26207805720d4f5564de60b241b'
Clément Bœsch [Mon, 3 Apr 2017 19:07:59 +0000 (21:07 +0200)]
Merge commit '1dd2b6c91ca5f26207805720d4f5564de60b241b'

* commit '1dd2b6c91ca5f26207805720d4f5564de60b241b':
  examples/qsvdec: switch to the hwcontext API

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d'
Clément Bœsch [Mon, 3 Apr 2017 19:05:03 +0000 (21:05 +0200)]
Merge commit 'f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d'

* commit 'f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d':
  libopusdec: default to stereo for invalid number of channels

This commit is a noop, see 8c8f543b81aa2b50bb6a6cfd370a0061281492a3

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'b34c6cd57a2e8aad5f773aea933f77883de320ec'
Clément Bœsch [Mon, 3 Apr 2017 19:02:54 +0000 (21:02 +0200)]
Merge commit 'b34c6cd57a2e8aad5f773aea933f77883de320ec'

* commit 'b34c6cd57a2e8aad5f773aea933f77883de320ec':
  dvbsub: cosmetics: Group all debug code together

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'b8cd7a3c8df2c3aac8d7a0b5a02d83caf61bd769'
Clément Bœsch [Mon, 3 Apr 2017 18:57:03 +0000 (20:57 +0200)]
Merge commit 'b8cd7a3c8df2c3aac8d7a0b5a02d83caf61bd769'

* commit 'b8cd7a3c8df2c3aac8d7a0b5a02d83caf61bd769':
  dvbsub: Check for errors from system()

printf(...) replaced with fprintf(stderr, ...) for logging errors.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '6427379f23eb4d2b82d8d274c616f68b65a2f723'
Clément Bœsch [Mon, 3 Apr 2017 18:54:04 +0000 (20:54 +0200)]
Merge commit '6427379f23eb4d2b82d8d274c616f68b65a2f723'

* commit '6427379f23eb4d2b82d8d274c616f68b65a2f723':
  als: Restructure DEBUG ifdefs to avoid unused function parameter warnings
  ac3enc: Restructure DEBUG ifdefs to avoid unused function parameter warnings
  ape: Restructure DEBUG ifdefs to avoid unused function parameter warnings

These 3 commits are not merged.

These commits were actually controversial in Libav. A good rationale can
be found here:
https://lists.libav.org/pipermail/libav-devel/2016-November/080698.htm

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d'
Clément Bœsch [Mon, 3 Apr 2017 18:50:03 +0000 (20:50 +0200)]
Merge commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d'

* commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d':
  doc: Add libxavs section

Merged-by: Clément Bœsch <u@pkh.me>
2 years agopng: set AVFrame flags/fields before calling setup_finished().
Ronald S. Bultje [Mon, 3 Apr 2017 18:43:40 +0000 (14:43 -0400)]
png: set AVFrame flags/fields before calling setup_finished().

Fixes tsan warnings in fate-apng:

WARNING: ThreadSanitizer: data race (pid=51230)
  Read of size 4 at 0x7d50000042fc by main thread (mutexes: write M1000):
    #0 frame_copy_props frame.c:302 (ffmpeg:x86_64+0x1019a35d6)
[..]
  Previous write of size 4 at 0x7d50000042fc by thread T1 (mutexes: write M997):
    #0 decode_idat_chunk pngdec.c:708 (ffmpeg:x86_64+0x100f5562a)

2 years agoMerge commit '97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21'
Clément Bœsch [Mon, 3 Apr 2017 18:45:35 +0000 (20:45 +0200)]
Merge commit '97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21'

* commit '97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21':
  rtpdec_mpeg4: const correctness for parse_fmtp_config()

This commit is a noop, see ed491db3e506c0e1ee6b9281ce898c4a79298e0f

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '81a3c42abe17e757fe890607f67201a240648993'
Clément Bœsch [Mon, 3 Apr 2017 18:43:45 +0000 (20:43 +0200)]
Merge commit '81a3c42abe17e757fe890607f67201a240648993'

* commit '81a3c42abe17e757fe890607f67201a240648993':
  Drop some bogus Doxygen documentation.

See 9365dfcbf665b83b2e60c5ec5e2abf1f0a49e2c3

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d'
Clément Bœsch [Mon, 3 Apr 2017 18:41:16 +0000 (20:41 +0200)]
Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d'

* commit 'a1d9de304fe63614e3aa8117fef17491fa80093d':
  Fix some mismatches between function parameter and doxygen parameter names.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '4d960a11855f4212eb3a4e470ce890db7f01df29'
Clément Bœsch [Mon, 3 Apr 2017 18:40:36 +0000 (20:40 +0200)]
Merge commit '4d960a11855f4212eb3a4e470ce890db7f01df29'

* commit '4d960a11855f4212eb3a4e470ce890db7f01df29':
  aarch64: vp9itxfm: Use w3 instead of x3 for the int eob parameter

This commit is a noop, see a95e7de41dc3f5c8b4738582111f9470e674742a

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e5b0fc170f85b00f7dd0ac514918fb5c95253d39'
Clément Bœsch [Mon, 3 Apr 2017 18:40:16 +0000 (20:40 +0200)]
Merge commit 'e5b0fc170f85b00f7dd0ac514918fb5c95253d39'

* commit 'e5b0fc170f85b00f7dd0ac514918fb5c95253d39':
  arm: vp9itxfm: Simplify the stack alignment code

This commit is a noop, see a71cd8439fd32fd83b7a9b9ac8d6f861846770c7

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'
Clément Bœsch [Mon, 3 Apr 2017 18:39:05 +0000 (20:39 +0200)]
Merge commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'

* commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8':
  hlsenc: Fix the openssl support

This commit is a noop, see edc43c571d66b07315f99d00b5ada667fc77b932

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'
Clément Bœsch [Mon, 3 Apr 2017 18:36:31 +0000 (20:36 +0200)]
Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'

* commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9': (35 commits)
  qdm2: Convert to the new bitstream reader
  qcelp: Convert to the new bitstream reader
  pcx: Convert to the new bitstream reader
  opus: Convert to the new bitstream reader
  nellymoser: Convert to the new bitstream reader
  jvdec: Convert to the new bitstream reader
  hqx: Convert to the new bitstream header
  hq_hqa: Convert to the new bitstream reader
  gsm: Convert to the new bitstream reader
  g72x: Convert to the new bitstream reader
  g2meet: Convert to the new bitstream reader
  fraps: Convert to the new bitstream reader
  flashsv: Convert to the new bitstream reader
  faxcompr: Convert to the new bitstream reader
  exr: Convert to the new bitstream reader
  escape130: Convert to the new bitstream reader
  escape124: Convert to the new bitstream reader
  dvdsubdec: Convert to the new bitstream reader
  dss_sp: Convert to the new bitstream reader
  cook: Convert to the new bitstream reader
  ...

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2 years agopng: split header state and data state in two separate variables.
Ronald S. Bultje [Mon, 3 Apr 2017 14:08:29 +0000 (10:08 -0400)]
png: split header state and data state in two separate variables.

Fixes a reported (but false) race condition in tsan for fate-apng:

WARNING: ThreadSanitizer: data race (pid=6274)
  Read of size 4 at 0x7d680001ec78 by main thread (mutexes: write M1338):
    #0 update_thread_context src/libavcodec/pngdec.c:1456 (ffmpeg+0x000000dacf0c)
[..]
  Previous write of size 4 at 0x7d680001ec78 by thread T1 (mutexes: write M1335):
    #0 decode_idat_chunk src/libavcodec/pngdec.c:737 (ffmpeg+0x000000dae951)

2 years agohevc: only write to max_ra and pocTid0 in the first slice.
Ronald S. Bultje [Mon, 3 Apr 2017 13:51:10 +0000 (09:51 -0400)]
hevc: only write to max_ra and pocTid0 in the first slice.

Values from subsequent values are guaranteed to be identical (since
poc and nal_unit_type are checked to be the same between slices), so
this doesn't affect output in any way, but does resolve the remaining
reported race conditions (by tsan) in fate-hevc.

In practice, this fixes tsan warnings like this:

WARNING: ThreadSanitizer: data race (pid=25334)
  Read of size 4 at 0x7d9c0001adcc by main thread (mutexes: write M1386):
    #0 hevc_update_thread_context src/libavcodec/hevcdec.c:3310 (ffmpeg+0x000000b41c7c)
[..]
  Previous write of size 4 at 0x7d9c0001adcc by thread T1 (mutexes: write M1383):
    #0 hls_slice_header src/libavcodec/hevcdec.c:596 (ffmpeg+0x000000b43a22)

2 years agopthread_frame: call update_context_from_user() after acquiring lock.
Ronald S. Bultje [Mon, 3 Apr 2017 13:48:53 +0000 (09:48 -0400)]
pthread_frame: call update_context_from_user() after acquiring lock.

Otherwise the thread may still be in the middle of decoding a previous
frame, which would effectively trigger a race condition on any field
concurrently read and written.

In practice, this fixes tsan warnings like the following:

WARNING: ThreadSanitizer: data race (pid=17380)
  Write of size 4 at 0x7d64000160fc by main thread:
    #0 update_context_from_user src/libavcodec/pthread_frame.c:335 (ffmpeg+0x000000dca515)
[..]
  Previous read of size 4 at 0x7d64000160fc by thread T2 (mutexes: write M1821):
    #0 ff_thread_report_progress src/libavcodec/pthread_frame.c:565 (ffmpeg+0x000000dcb08a)

2 years agoffmpeg: make transcode_init_done atomic.
Ronald S. Bultje [Fri, 31 Mar 2017 15:27:20 +0000 (11:27 -0400)]
ffmpeg: make transcode_init_done atomic.

Should fix tsan warnings in fate-fifo-muxer-h264/wav:

WARNING: ThreadSanitizer: data race (pid=26552)
  Write of size 4 at 0x000001e0d7c0 by main thread:
    #0 transcode_init src/ffmpeg.c:3761 (ffmpeg+0x00000050ca1c)
[..]
  Previous read of size 4 at 0x000001e0d7c0 by thread T1:
    #0 decode_interrupt_cb src/ffmpeg.c:460 (ffmpeg+0x0000004fde19)

2 years agocodec_desc: mark some lossless audio codecs as intraonly.
Ronald S. Bultje [Mon, 3 Apr 2017 13:36:32 +0000 (09:36 -0400)]
codec_desc: mark some lossless audio codecs as intraonly.

Fixes tsan warnings in several audio codecs (flac, alac, wavpack, tta
and tak) that look like this:

WARNING: ThreadSanitizer: data race (pid=14340)
  Read of size 4 at 0x7d64000169d8 by main thread (mutexes: write M1335):
    #0 update_context_from_thread src/libavcodec/pthread_frame.c:284 (ffmpeg+0x000000dc795f)
[..]
  Previous write of size 4 at 0x7d64000169d8 by thread T1 (mutexes: write M1333):
    #0 wavpack_decode_block src/libavcodec/wavpack.c:1012 (ffmpeg+0x00000112b175)

2 years agoh264: don't sync pic_id between threads.
Ronald S. Bultje [Mon, 3 Apr 2017 13:25:15 +0000 (09:25 -0400)]
h264: don't sync pic_id between threads.

This is how the ref list manager links bitstream IDs to H264Picture/Ref
objects, and is local to the producer thread. There is no need for the
consumer thread to know the bitstream IDs of its references in their
respective producer threads.

In practice, this fixes tsan warnings when running fate-h264:

WARNING: ThreadSanitizer: data race (pid=19295)
  Read of size 4 at 0x7dbc0000e614 by main thread (mutexes: write M1914):
    #0 ff_h264_ref_picture src/libavcodec/h264_picture.c:112 (ffmpeg+0x0000013b3709)
[..]
  Previous write of size 4 at 0x7dbc0000e614 by thread T2 (mutexes: write M1917):
    #0 build_def_list src/libavcodec/h264_refs.c:91 (ffmpeg+0x0000013b46cf)

2 years agofate : add test for exr with offset table set to 0
Martin Vignali [Sun, 2 Apr 2017 19:13:01 +0000 (21:13 +0200)]
fate : add test for exr with offset table set to 0

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolibavcodec/exr : fix scanline offset table recreation on big endian
Martin Vignali [Sun, 2 Apr 2017 19:11:32 +0000 (21:11 +0200)]
libavcodec/exr : fix scanline offset table recreation on big endian

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavc/vaapi_encode: fix p_per_i calculate issue.
Jun Zhao [Wed, 29 Mar 2017 09:18:59 +0000 (17:18 +0800)]
lavc/vaapi_encode: fix p_per_i calculate issue.

now gop_size <= (max_b_frames + 1) * p_per_i + 1 (IDR frame),
so celing p_per_i = (gop_size - 1 + max_b_frames) / (max_b_frames + 1)

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Leilei <leilei.shang@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2 years agoChangelog: fix position of VAAPI MPEG-2/VP8 encode entry
Mark Thompson [Sun, 2 Apr 2017 21:55:33 +0000 (22:55 +0100)]
Changelog: fix position of VAAPI MPEG-2/VP8 encode entry

This was merged in the wrong place.

2 years agoChangelog: add missing entry for VP8 QSV decoder
James Almer [Sun, 2 Apr 2017 21:39:01 +0000 (18:39 -0300)]
Changelog: add missing entry for VP8 QSV decoder

2 years agoChangelog: add 3.3
James Almer [Sun, 2 Apr 2017 21:38:36 +0000 (18:38 -0300)]
Changelog: add 3.3

2 years agobuild: Add missing object dependency for extract_extradata bitstream filter
Diego Biurrun [Sun, 2 Apr 2017 19:09:16 +0000 (16:09 -0300)]
build: Add missing object dependency for extract_extradata bitstream filter

Cherry-picked from libav commit cfee5e1a0fa892fadd19b8848545d62f2386a6e7

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoBump versions for master after 3.3 n3.4-dev
Michael Niedermayer [Sun, 2 Apr 2017 17:54:12 +0000 (19:54 +0200)]
Bump versions for master after 3.3

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoBump minor for 3.3
Michael Niedermayer [Sun, 2 Apr 2017 17:49:45 +0000 (19:49 +0200)]
Bump minor for 3.3

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agocompat/atomics: fix atomic_fetch_xor
James Almer [Sun, 2 Apr 2017 03:57:17 +0000 (00:57 -0300)]
compat/atomics: fix atomic_fetch_xor

2 years agoavcodec/extract_extradata_bsf: make sure all parameter set NAL units were found for...
James Almer [Sat, 25 Mar 2017 01:37:34 +0000 (22:37 -0300)]
avcodec/extract_extradata_bsf: make sure all parameter set NAL units were found for h264/hevc

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat/oggparsedaala: Do not leave an invalid value in gpshift
Michael Niedermayer [Sat, 1 Apr 2017 17:18:35 +0000 (19:18 +0200)]
avformat/oggparsedaala: Do not leave an invalid value in gpshift

Fixes: undefined behavior
Fixes: 702974

Found-by: Thomas Guilbert <tguilbert@google.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/oggparsedaala: Check duration for AV_NOPTS_VALUE
Michael Niedermayer [Sat, 1 Apr 2017 17:18:34 +0000 (19:18 +0200)]
avformat/oggparsedaala: Check duration for AV_NOPTS_VALUE

This avoids an integer overflow
the solution matches oggparsevorbis.c and 45581ed15d2ad5955e24d809820c1675da68f500

Fixes: 700242

Found-by: Thomas Guilbert <tguilbert@google.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agofate: add bitexact sws_flags to hevc-extradata-reload
James Almer [Sat, 1 Apr 2017 16:38:50 +0000 (13:38 -0300)]
fate: add bitexact sws_flags to hevc-extradata-reload

Makes the test output consistent across all targets.

Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:40 +0000 (18:53 +0200)]
Merge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423'

* commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit '5a1d605ceae448b476a525f7368ec452000d1f26'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:36 +0000 (18:53 +0200)]
Merge commit '5a1d605ceae448b476a525f7368ec452000d1f26'

* commit '5a1d605ceae448b476a525f7368ec452000d1f26':
  hwcontext_dxva2: split transfer_data() into upload/download functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit '9d7026574bbbe67d004a1c32911da75375692967'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:32 +0000 (18:53 +0200)]
Merge commit '9d7026574bbbe67d004a1c32911da75375692967'

* commit '9d7026574bbbe67d004a1c32911da75375692967':
  hwcontext_dxva2: fix handling of the mapping flags

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:27 +0000 (18:53 +0200)]
Merge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'

* commit '0d3176e32f351d18d6174d8b05796829a75a4c6b':
  hwcontext_dxva2: do not assume the destination format during mapping is always the right one

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoavcodec/dnxhdenc: fix indentation issue
Paul B Mahol [Sat, 1 Apr 2017 16:50:30 +0000 (18:50 +0200)]
avcodec/dnxhdenc: fix indentation issue

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/dnxhdenc: DNxHR 444 and HQX support
Paul B Mahol [Sat, 25 Mar 2017 19:19:26 +0000 (20:19 +0100)]
avcodec/dnxhdenc: DNxHR 444 and HQX support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoMerge commit 'adb0e941c329a4778ade6dd0a326274472992f54'
Clément Bœsch [Sat, 1 Apr 2017 16:22:21 +0000 (18:22 +0200)]
Merge commit 'adb0e941c329a4778ade6dd0a326274472992f54'

* commit 'adb0e941c329a4778ade6dd0a326274472992f54':
  avpacket: Mark src pointer as constant

See 5bb3f8825584a319b25b430e4ece2fa5b2b47ff9

Merged-by: Clément Bœsch <u@pkh.me>
2 years agodoc/libav-merge: document hlsenc encryption state
Clément Bœsch [Sat, 1 Apr 2017 16:21:11 +0000 (18:21 +0200)]
doc/libav-merge: document hlsenc encryption state

2 years agoMerge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'
Clément Bœsch [Sat, 1 Apr 2017 16:17:02 +0000 (18:17 +0200)]
Merge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'

* commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2':
  hlsenc: Add encryption support

This commit is a noop, see 907ac20aa29341e49a4f89ff3d4240d92f9a0cb9

Note that this commit differs from our encryption support in various
ways so it may need some adjustments in the future.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavcodec/exr: add support for scanline file where offsets are set to zero
Dzung Hoang [Sat, 25 Mar 2017 11:40:08 +0000 (12:40 +0100)]
avcodec/exr: add support for scanline file where offsets are set to zero

2 years agovf_deinterlace_vaapi: Mark as hwframe-aware
Mark Thompson [Sat, 1 Apr 2017 14:32:17 +0000 (15:32 +0100)]
vf_deinterlace_vaapi: Mark as hwframe-aware

Commits ade370a4 and e3fb74f7 were reordered while merging, so this
change got lost.

2 years agoMerge commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88'
Clément Bœsch [Sat, 1 Apr 2017 13:39:57 +0000 (15:39 +0200)]
Merge commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88'

* commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88':
  crypto: Add encryption support

See 00d4013d9f841c189a2f10dd05526ca40129b880

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb'
Clément Bœsch [Sat, 1 Apr 2017 13:15:19 +0000 (15:15 +0200)]
Merge commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb'

* commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb':
  qsvdec: Drop stray extra braces around initializer

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '715b8243460836fb7dd15bf7e41668e773beb276'
Clément Bœsch [Sat, 1 Apr 2017 13:14:31 +0000 (15:14 +0200)]
Merge commit '715b8243460836fb7dd15bf7e41668e773beb276'

* commit '715b8243460836fb7dd15bf7e41668e773beb276':
  qsv: Drop some unused variables

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavcodec/dsddec: correct for DSD silence bit-ordering
Takayuki 'January June' Suwa [Fri, 31 Mar 2017 17:14:13 +0000 (02:14 +0900)]
avcodec/dsddec: correct for DSD silence bit-ordering

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit 'bb265b764a055f2dc576b9aec62460d9580868f4'
Clément Bœsch [Sat, 1 Apr 2017 10:46:09 +0000 (12:46 +0200)]
Merge commit 'bb265b764a055f2dc576b9aec62460d9580868f4'

* commit 'bb265b764a055f2dc576b9aec62460d9580868f4':
  examples/transcode_aac: Drop pointless return value const qualifier

This commit is a noop, the function doesn't exist in FFmpeg anymore
since e181e2909b214e043016c108ea0bc3b8094fc63b.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agodoc/examples/transcode_aac: replace local get_error_text with av_err2str
Clément Bœsch [Sat, 1 Apr 2017 10:45:33 +0000 (12:45 +0200)]
doc/examples/transcode_aac: replace local get_error_text with av_err2str

2 years agoMerge commit 'bfe92dfe60f601b3f20a918ffcc0acdf40a5955c'
Clément Bœsch [Sat, 1 Apr 2017 10:43:04 +0000 (12:43 +0200)]
Merge commit 'bfe92dfe60f601b3f20a918ffcc0acdf40a5955c'

* commit 'bfe92dfe60f601b3f20a918ffcc0acdf40a5955c':
  Ignore all generated example binaries

This commit is a noop, the .gitignore was updated during the merges of
these examples.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f'
Clément Bœsch [Sat, 1 Apr 2017 10:41:42 +0000 (12:41 +0200)]
Merge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f'

* commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f':
  doc: Add note about recent regression in AviSynth+

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'
Clément Bœsch [Sat, 1 Apr 2017 10:12:42 +0000 (12:12 +0200)]
Merge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'

* commit '3cc3463f306f425f76bd962755df1132eeac6dfa':
  avisynth: Support pix_fmts added to AviSynth+

This commit is mostly a noop, see
92916e8542e425ca20daddb490261a5818643206.

Cosmetics and a small fix are merged.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9'
Clément Bœsch [Sat, 1 Apr 2017 10:11:24 +0000 (12:11 +0200)]
Merge commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9'

* commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9':
  avisynth: Simplify the pix_fmt check for the newer AviSynth API

This commit is a noop, see 0ed5c3ce81811dcd93f21cdd1204d4c68bca9654

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b'
Clément Bœsch [Sat, 1 Apr 2017 10:09:50 +0000 (12:09 +0200)]
Merge commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b'

* commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b':
  avisynth: Fix setting stream timebase

This commit is a noop, see 8009a1f1fdce16a59ea911e2b768e56ec4c8e344

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '481ff3cf018811ba3235f1c236e970f32a6300b9'
Clément Bœsch [Sat, 1 Apr 2017 10:06:21 +0000 (12:06 +0200)]
Merge commit '481ff3cf018811ba3235f1c236e970f32a6300b9'

* commit '481ff3cf018811ba3235f1c236e970f32a6300b9':
  fate: Add h264 and hevc extradata reload tests

Only the HEVC part is merged, see 00c80798160f930ce680f98f869c23d91a261f06

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a'
Clément Bœsch [Sat, 1 Apr 2017 09:59:47 +0000 (11:59 +0200)]
Merge commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a'

* commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a':
  mov: Fix identity matrix boolean logic

This commit is a noop, see 7010ebdf1ff7514fa505ff166fb60ce762a46b8b

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b'
Clément Bœsch [Sat, 1 Apr 2017 09:39:09 +0000 (11:39 +0200)]
Merge commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b'

* commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b':
  checkasm: vp9dsp: Benchmark the dc-only version of idct_idct separately

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057'
Clément Bœsch [Sat, 1 Apr 2017 09:36:38 +0000 (11:36 +0200)]
Merge commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057'

* commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057':
  aarch64: vp9: loop filter: replace 'orr; cbn?z' with 'adds; b.{eq,ne};

This commit is a noop, see e7ae8f7a715843a5089d18e033afb3ee19ab3057

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc'
Clément Bœsch [Sat, 1 Apr 2017 09:32:53 +0000 (11:32 +0200)]
Merge commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc'

* commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc':
  aarch64: vp9: use alternative returns in the core loop filter function

This commit is a noop, see 62ea07d797c503bc4b727e56d9c0f914a93c8ef6

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce'
Clément Bœsch [Sat, 1 Apr 2017 09:30:55 +0000 (11:30 +0200)]
Merge commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce'

* commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce':
  libilbc: support for latest git of libilbc

This commit is a noop, see 59af5383c18c8cf3fe2a4b5cc1ebf2f3300bdfe5

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'
Clément Bœsch [Sat, 1 Apr 2017 09:29:34 +0000 (11:29 +0200)]
Merge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'

* commit 'ffe89e1edb0281ff65d1bda88253784e9283b717':
  configure: Move mjpeg_vaapi_decoder dependency declarations to the right place

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'
Clément Bœsch [Sat, 1 Apr 2017 09:26:23 +0000 (11:26 +0200)]
Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'

* commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56':
  golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'fbd1f7639d0142c391bec85d1d840c835210843f'
Clément Bœsch [Sat, 1 Apr 2017 09:25:37 +0000 (11:25 +0200)]
Merge commit 'fbd1f7639d0142c391bec85d1d840c835210843f'

* commit 'fbd1f7639d0142c391bec85d1d840c835210843f':
  af_asyncts: Use llabs instead of labs for 64-bit variable

This commit is a noop, see a8fe8d6b4a35c95aa94fccde5f001041278d197c

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e0b164576f7467b7b1127c18175e215dc1df011f'
Clément Bœsch [Sat, 1 Apr 2017 09:17:24 +0000 (11:17 +0200)]
Merge commit 'e0b164576f7467b7b1127c18175e215dc1df011f'

* commit 'e0b164576f7467b7b1127c18175e215dc1df011f':
  qsv: Add VP8 decoder

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoconfigure: Fix GPL dependency for avisynth / avxsynth.
Carl Eugen Hoyos [Fri, 31 Mar 2017 23:09:19 +0000 (01:09 +0200)]
configure: Fix GPL dependency for avisynth / avxsynth.

2 years agoMerge commit '182cf170a544bce069c8690c90b49381150a1f10'
Clément Bœsch [Sat, 1 Apr 2017 07:55:12 +0000 (09:55 +0200)]
Merge commit '182cf170a544bce069c8690c90b49381150a1f10'

* commit '182cf170a544bce069c8690c90b49381150a1f10':
  vp8: Return stream format information from parser

Return codes are adjusted to consume the whole packet in case of error
as the API does not allow returning AVERROR codes (a negative return
value is valid).

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavutil/avstring: add av_strreplace API into avstring
Steven Liu [Sat, 1 Apr 2017 02:55:04 +0000 (10:55 +0800)]
avutil/avstring: add av_strreplace API into avstring

refer to: http://creativeandcritical.net/str-replace-c
add av_strreplace API for replace string operations.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agox86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5...
James Almer [Fri, 31 Mar 2017 23:42:16 +0000 (20:42 -0300)]
x86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5796be34

See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html

2 years agodoc/libav-merge: link to the relevant ml thread in the extract_extradata line
James Almer [Fri, 31 Mar 2017 23:35:16 +0000 (20:35 -0300)]
doc/libav-merge: link to the relevant ml thread in the extract_extradata line

2 years agofate/exr : add test for uint32 data
Martin Vignali [Sat, 18 Mar 2017 12:45:06 +0000 (13:45 +0100)]
fate/exr : add test for uint32 data

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>