Commit Graph

84966 Commits

Author SHA1 Message Date
James Almer 28bace5c0a Merge commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc'
* commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc':
  vp9: Make the subpel filters non-static

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:20:01 -03:00
James Almer 51d95914e0 Merge commit '98cae966c77875e26c5958206a6cfe7eba6269e8'
* commit '98cae966c77875e26c5958206a6cfe7eba6269e8':
  matroskaenc: write updated STREAMINFO metadata for FLAC streams if available

This commit is a noop, see 8c1342e631

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:17:16 -03:00
James Almer 13a211e632 Merge commit 'f4bf236338f6001736a4784b9c23de863057a583'
* commit 'f4bf236338f6001736a4784b9c23de863057a583':
  matroskaenc: fix muxing AAC streams when using aac_adtstoasc bsf

This commit is a noop. aac_adtstoasc bsf sends its extradata update
straight to codecpar->extradata.
This behavior violates the bsf API and should be fixed so this change
may then be applied.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:14:24 -03:00
James Almer e2f6e1c4a8 Merge commit '84f225684cd389747907381122c073aa1c8b6bf1'
* commit '84f225684cd389747907381122c073aa1c8b6bf1':
  pthread_frame: properly propagate the hw frame context across frame threads

This commit is a noop, see 98f89d615b.
Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 14:46:14 -03:00
James Almer 5694427dc3 Merge commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6'
* commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6':
  mpegaudiodsp: aarch64: Adjust function prototype after 2caa93b813

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 14:43:37 -03:00
James Almer 0ad9aff022 Merge commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0'
* commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0':
  configure: Move license checks directly after command line parsing

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 14:39:10 -03:00
James Almer 8d50dd976d Merge commit 'c78495d1cdac6dd13786a7e5571b606604a360bd'
* commit 'c78495d1cdac6dd13786a7e5571b606604a360bd':
  configure: Log name and parameters of all helper functions where it makes sense

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 14:36:38 -03:00
James Almer 3795899978 Merge commit '8a6e7a67cb2943f552569801539829a304971302'
* commit '8a6e7a67cb2943f552569801539829a304971302':
  configure: Use check_cpp in CPP flags tests

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 14:34:25 -03:00
James Almer e5177e8f8d Merge commit '831005b2302cbeb377e3f00fd18c78928bcec185'
* commit '831005b2302cbeb377e3f00fd18c78928bcec185':
  configure: Log correct test name and use correct filter when testing objective C flags

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 14:32:32 -03:00
James Almer f0df60d392 Merge commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43'
* commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43':
  configure: Do not unconditionally check for (and enable) xlib

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 14:29:22 -03:00
James Almer 2a2854f578 ffprobe: use av_spherical_projection_name() to print spherical projection names
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 13:27:09 -03:00
James Almer 2efb70c379 avformat/dump: use av_spherical_projection_name() to print spherical projection names
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 13:27:04 -03:00
James Almer 9033e8723c avutil/spherical: add av_spherical_projection_name()
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31 13:26:56 -03:00
Carl Eugen Hoyos 76dd87c929 lavf/amr: Return AVERROR_EOF on EOF.
Fixes ticket #6280.
2017-03-31 18:19:41 +02:00
James Almer 0505a1d9c4 doc/libav-merge: remove line about AC3 fixed decoder speedup
It was addressed in commit 91ccd38c0b
2017-03-31 11:31:41 -03:00
Ronald S. Bultje 1ddc37051f h264: only assign H264Picture::mbaff for first slice.
The value must be identical between slices, since mbaff depends on
picture_structure and sps, both of which are checked to be identical
to the first slice before this point.

In practice, this silences some tsan warnings in fate-h264.
2017-03-31 08:26:24 -04:00
Ronald S. Bultje b5300c8ad8 h264: don't write to source picture object in ff_h264_ref_picture().
Doing so is analogous to writing to source data in memcpy(), and causes
(harmless) tsan warnings in fate-h264.
2017-03-31 08:26:24 -04:00
Ronald S. Bultje 081c21ca55 lagarith: assign correct per-thread value to LagarithContext::avctx.
This fixes race conditions reported by tsan in fate-lagarith. The races
were because each thread's LagarithContext::avctx was set to the first
thread's AVCodecContext.
2017-03-31 08:26:24 -04:00
Ronald S. Bultje 73f863d751 fic: set pict_type/key_frame after (instead of during) slice decoding.
This fixes a race condition that was already documented in the source
code, and is also reported by tsan in fate-fic-avi.
2017-03-31 08:26:23 -04:00
Ronald S. Bultje 9e2050b698 codec_desc: mark fraps as an intra-only codec.
Fixes reported race conditions by tsan in fate-avio-direct.
2017-03-31 08:26:23 -04:00
Ronald S. Bultje f800d6508d dnxhd: initialize DNXHDContext::avctx to each thread's respective one.
Otherwise all thread's private contexts have the avctx pointer set to
the AVCodecContext of the first thread, which means all writes to
ctx->avctx->* (in e.g. read_header) are effectively race conditions.

Fixes fate-dnxhd under tsan.
2017-03-31 08:26:23 -04:00
Sasi Inguva ef71dc7948 lavf/mov.c: Add -advanced_editlist option for mov format.
Adding an MOV format option to turn on/off the editlist supporting code, introduced in ca6cae73db

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 13:59:21 +02:00
Michael Niedermayer 58b867a7cf Bump minor versions for master after release/3.3 branchpoint
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 13:21:06 +02:00
Michael Niedermayer fc332f3e29 Bump minor versions for staring release/3.3 branch
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 13:21:06 +02:00
Michael Niedermayer 1317a9f7aa doc/APIchanges: Update 2017-03-31 13:21:06 +02:00
Michael Niedermayer 55d53cb593 avfilter/avfiltergraph: Check for allocation failure in avfilter_graph_queue_command()
Fixes: CID1396538

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 12:28:58 +02:00
Michael Niedermayer 5036e214b0 avfilter/vf_zoompan: Free out frame on error
Fixes: CID1398578

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 12:28:58 +02:00
Michael Niedermayer c217027c11 avcodec/mips: fix build
Found-by: Shivraj Patil <shivraj.patil@imgtec.com>
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 12:28:58 +02:00
Clément Bœsch 12bfed2fd9 configure: remove redundant info
Based on d1a91ebe49
2017-03-31 11:30:38 +02:00
Clément Bœsch d62606480f Merge commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff'
* commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff':
  configure: Print list of enabled programs

This commit is mostly a noop, see 832b4a4a43

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 11:25:06 +02:00
Clément Bœsch 6f95771046 Merge commit '576c9003aef0fe18c0cf8da6e865211610552005'
* commit '576c9003aef0fe18c0cf8da6e865211610552005':
  configure: Improve output wording

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 11:02:07 +02:00
Clément Bœsch adc489adc9 Merge commit 'a3483f79933e8f1fd99d524e3218688e14c59150'
* commit 'a3483f79933e8f1fd99d524e3218688e14c59150':
  avconv: Drop stray leftover debug output

This commit is a noop, see a283665693

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 10:46:06 +02:00
Clément Bœsch e3287077ec Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'
* commit '67deba8a416d818f3d95aef0aa916589090396e2':
  Use avpriv_report_missing_feature() where appropriate

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 10:40:34 +02:00
Clément Bœsch b6c293d5e6 Merge commit '59d2b00d201935c16408a2917957d89a170fe58f'
* commit '59d2b00d201935c16408a2917957d89a170fe58f':
  configure: Add --quiet command line parameter to suppress informative output

The license assignment is moved out of the quiet condition to make sure
it ends up in config.h

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 10:22:32 +02:00
Clément Bœsch a5c29c608f Merge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'
* commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0':
  fate: checkasm: Split monolithic test into individual components

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 10:13:25 +02:00
Clément Bœsch b589e83f43 Merge commit '9498237049d15812cecb79df47b196c73013908b'
* commit '9498237049d15812cecb79df47b196c73013908b':
  checkasm: Add --test parameter to check only specific components

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 10:06:13 +02:00
Clément Bœsch 5273916700 Merge commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1'
* commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1':
  mov: Read multiple stsd from DV

This commit is a noop, see a765ba647d

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 10:03:48 +02:00
Clément Bœsch 5ce02f4c55 Merge commit '47a795727f5433f5238a8a244cf181f61ea5af2c'
* commit '47a795727f5433f5238a8a244cf181f61ea5af2c':
  hevc: Support extradata changes from multiple stsd

This commit is a noop, see 25fcbf7a84

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 10:02:39 +02:00
Clément Bœsch 4eb7296184 Merge commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036'
* commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036':
  hevc: Allow parsing external extradata buffers

This commit is a noop as it matches FFmpeg state.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 09:57:33 +02:00
Clément Bœsch 8ee123ac9a Merge commit '5be21531119d7a97ebc706800d1608272ee5a507'
* commit '5be21531119d7a97ebc706800d1608272ee5a507':
  hevc: Move hevc_decode_extradata before frame decoding

This commit is a noop, hevc_decode_extradata() is already above
hevc_decode_frame().

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 09:53:35 +02:00
Clément Bœsch 9a60735fa1 Merge commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0'
* commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0':
  lavc: Add hevc main10 profile to avconv cli

This commit is a noop, see 271afd632f

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 09:50:12 +02:00
Clément Bœsch 82ad9cbd32 Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'
* commit '17dac56b8fdd80c594c39b76de3f27a7949afbde':
  lavu: Rename ycgco color space appropriately

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 09:46:51 +02:00
Clément Bœsch 1ea0df14c3 Merge commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1'
* commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1':
  h264_qpel: x86: Move function with only one instance out of template macro

Note: warning is present with clang.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 09:44:04 +02:00
Mark Thompson ebce133228 pthread_frame: Propagate sw_pix_fmt across threads
This is required by the VP9 hwaccels (both DXVA2 and VAAPI) when
threads are enabled.

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
2017-03-31 00:23:02 +01:00
Michael Niedermayer afebf470ca avutil/tests/dict: Check return of av_dict_parse_string()
Fixes: CID1396402

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer 77a3c288bd avformat/mov: Init ref_sc / ref_st to NULL
This is more robust in case some change or corner case causes them to be
dereferenced before being set

Fixes CID1396274, CID1396275

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer bd8201566d avformat/libopenmpt: Check for avio_size() failure
Fixes CID1396850

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer 477ba8f939 avfilter/af_chorus & aecho: Handle NULL return from av_strtok()
Fixes CID1396260

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer fe46d92c15 avcodec/clearvideo: Do not lose the return code of decode_mb()
Fixes CID1401671

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Clément Bœsch 2a68d3b1a5 Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'
* commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301':
  avplay: Correct function pointer assignments in options array

This commit is a noop, see a9a1bc56ab

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:23:40 +02:00