ffmpeg.git
2 years agoMerge commit '11623217e3c9b859daee544e31acdd0821b61039'
James Almer [Fri, 31 Mar 2017 18:50:22 +0000 (15:50 -0300)]
Merge commit '11623217e3c9b859daee544e31acdd0821b61039'

* commit '11623217e3c9b859daee544e31acdd0821b61039':
  arm: vp9mc: Use a different helper register for PIC loads

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '824e8c284054f323f854892d1b4739239ed1fdc7'
James Almer [Fri, 31 Mar 2017 18:48:52 +0000 (15:48 -0300)]
Merge commit '824e8c284054f323f854892d1b4739239ed1fdc7'

* commit '824e8c284054f323f854892d1b4739239ed1fdc7':
  arm: Clear the gp register alias at the end of functions

This commit is a noop, see 86c5a23ee5236aa0996435247a2141ac90fc491e

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'
James Almer [Fri, 31 Mar 2017 18:46:13 +0000 (15:46 -0300)]
Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'

* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '6a62795d4051f435a9a2c59395d96913693922f8'
James Almer [Fri, 31 Mar 2017 18:43:28 +0000 (15:43 -0300)]
Merge commit '6a62795d4051f435a9a2c59395d96913693922f8'

* commit '6a62795d4051f435a9a2c59395d96913693922f8':
  aarch64: h264idct: Use the offset parameter to movrel

This commit is a noop, see da5c8284c02c4ccc3596bc52d54a10166708094f

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '557c1675cf0e803b2fee43b4c8b58433842c84d0'
James Almer [Fri, 31 Mar 2017 18:40:41 +0000 (15:40 -0300)]
Merge commit '557c1675cf0e803b2fee43b4c8b58433842c84d0'

* commit '557c1675cf0e803b2fee43b4c8b58433842c84d0':
  arm: vp9mc: Minor adjustments from review of the aarch64 version

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc'
James Almer [Fri, 31 Mar 2017 18:35:31 +0000 (15:35 -0300)]
Merge commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc'

* commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc':
  aarch64: vp9: Add NEON optimizations of VP9 MC functions

This commit is a noop, see 1f7801c2bc93811df4daf09b839572bc4c8b3524

Merged-by: James Almer <jamrial@gmail.com>
2 years agodoc/libav-merge: mention aac_adtstoasc extradata update fix for matroska
James Almer [Fri, 31 Mar 2017 18:31:50 +0000 (15:31 -0300)]
doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska

2 years agoMerge commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c'
James Almer [Fri, 31 Mar 2017 18:23:11 +0000 (15:23 -0300)]
Merge commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c'

* commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c':
  aarch64: Add an offset parameter to the movrel macro

This commit is a noop, see 7fe898dbb949f0e31665d716f671e2428d50bb29

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc'
James Almer [Fri, 31 Mar 2017 18:20:01 +0000 (15:20 -0300)]
Merge commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc'

* commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc':
  vp9: Make the subpel filters non-static

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '98cae966c77875e26c5958206a6cfe7eba6269e8'
James Almer [Fri, 31 Mar 2017 18:16:44 +0000 (15:16 -0300)]
Merge commit '98cae966c77875e26c5958206a6cfe7eba6269e8'

* commit '98cae966c77875e26c5958206a6cfe7eba6269e8':
  matroskaenc: write updated STREAMINFO metadata for FLAC streams if available

This commit is a noop, see 8c1342e631d635f6cad13f9374c4f2005c22b9e5

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f4bf236338f6001736a4784b9c23de863057a583'
James Almer [Fri, 31 Mar 2017 17:49:13 +0000 (14:49 -0300)]
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>
2 years agoMerge commit '84f225684cd389747907381122c073aa1c8b6bf1'
James Almer [Fri, 31 Mar 2017 17:46:14 +0000 (14:46 -0300)]
Merge commit '84f225684cd389747907381122c073aa1c8b6bf1'

* commit '84f225684cd389747907381122c073aa1c8b6bf1':
  pthread_frame: properly propagate the hw frame context across frame threads

This commit is a noop, see 98f89d615b6490a5b93930c7bfa74c427dedf04e.
Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6'
James Almer [Fri, 31 Mar 2017 17:43:37 +0000 (14:43 -0300)]
Merge commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6'

* commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6':
  mpegaudiodsp: aarch64: Adjust function prototype after 2caa93b813adc5dbb7771dfe615da826a2947d18

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0'
James Almer [Fri, 31 Mar 2017 17:39:10 +0000 (14:39 -0300)]
Merge commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0'

* commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0':
  configure: Move license checks directly after command line parsing

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c78495d1cdac6dd13786a7e5571b606604a360bd'
James Almer [Fri, 31 Mar 2017 17:36:38 +0000 (14:36 -0300)]
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>
2 years agoMerge commit '8a6e7a67cb2943f552569801539829a304971302'
James Almer [Fri, 31 Mar 2017 17:34:25 +0000 (14:34 -0300)]
Merge commit '8a6e7a67cb2943f552569801539829a304971302'

* commit '8a6e7a67cb2943f552569801539829a304971302':
  configure: Use check_cpp in CPP flags tests

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '831005b2302cbeb377e3f00fd18c78928bcec185'
James Almer [Fri, 31 Mar 2017 17:32:32 +0000 (14:32 -0300)]
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>
2 years agoMerge commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43'
James Almer [Fri, 31 Mar 2017 17:29:22 +0000 (14:29 -0300)]
Merge commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43'

* commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43':
  configure: Do not unconditionally check for (and enable) xlib

Merged-by: James Almer <jamrial@gmail.com>
2 years agoffprobe: use av_spherical_projection_name() to print spherical projection names
James Almer [Wed, 29 Mar 2017 02:49:55 +0000 (23:49 -0300)]
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>
2 years agoavformat/dump: use av_spherical_projection_name() to print spherical projection names
James Almer [Wed, 29 Mar 2017 02:49:48 +0000 (23:49 -0300)]
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>
2 years agoavutil/spherical: add av_spherical_projection_name()
James Almer [Wed, 29 Mar 2017 02:49:40 +0000 (23:49 -0300)]
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>
2 years agolavf/amr: Return AVERROR_EOF on EOF.
Carl Eugen Hoyos [Fri, 31 Mar 2017 04:54:01 +0000 (06:54 +0200)]
lavf/amr: Return AVERROR_EOF on EOF.

Fixes ticket #6280.

2 years agodoc/libav-merge: remove line about AC3 fixed decoder speedup
James Almer [Fri, 31 Mar 2017 14:31:41 +0000 (11:31 -0300)]
doc/libav-merge: remove line about AC3 fixed decoder speedup

It was addressed in commit 91ccd38c0befb17d788c1621d1d4362dc1c40bd6

2 years agoh264: only assign H264Picture::mbaff for first slice.
Ronald S. Bultje [Wed, 29 Mar 2017 13:33:47 +0000 (09:33 -0400)]
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.

2 years agoh264: don't write to source picture object in ff_h264_ref_picture().
Ronald S. Bultje [Wed, 29 Mar 2017 13:03:49 +0000 (09:03 -0400)]
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.

2 years agolagarith: assign correct per-thread value to LagarithContext::avctx.
Ronald S. Bultje [Wed, 29 Mar 2017 00:11:43 +0000 (20:11 -0400)]
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.

2 years agofic: set pict_type/key_frame after (instead of during) slice decoding.
Ronald S. Bultje [Tue, 28 Mar 2017 23:52:07 +0000 (19:52 -0400)]
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.

2 years agocodec_desc: mark fraps as an intra-only codec.
Ronald S. Bultje [Tue, 28 Mar 2017 23:40:59 +0000 (19:40 -0400)]
codec_desc: mark fraps as an intra-only codec.

Fixes reported race conditions by tsan in fate-avio-direct.

2 years agodnxhd: initialize DNXHDContext::avctx to each thread's respective one.
Ronald S. Bultje [Tue, 28 Mar 2017 23:37:42 +0000 (19:37 -0400)]
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.

2 years agolavf/mov.c: Add -advanced_editlist option for mov format.
Sasi Inguva [Mon, 9 Jan 2017 17:23:38 +0000 (09:23 -0800)]
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 https://github.com/FFmpeg/FFmpeg/commit/ca6cae73db207f17a0d5507609de12842d8f0ca3

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoBump minor versions for master after release/3.3 branchpoint
Michael Niedermayer [Fri, 31 Mar 2017 10:35:26 +0000 (12:35 +0200)]
Bump minor versions for master after release/3.3 branchpoint

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoBump minor versions for staring release/3.3 branch
Michael Niedermayer [Fri, 31 Mar 2017 10:33:25 +0000 (12:33 +0200)]
Bump minor versions for staring release/3.3 branch

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/APIchanges: Update
Michael Niedermayer [Fri, 31 Mar 2017 11:20:20 +0000 (13:20 +0200)]
doc/APIchanges: Update

2 years agoavfilter/avfiltergraph: Check for allocation failure in avfilter_graph_queue_command()
Michael Niedermayer [Thu, 30 Mar 2017 20:45:40 +0000 (22:45 +0200)]
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>
2 years agoavfilter/vf_zoompan: Free out frame on error
Michael Niedermayer [Thu, 30 Mar 2017 21:34:48 +0000 (23:34 +0200)]
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>
2 years agoavcodec/mips: fix build
Michael Niedermayer [Fri, 31 Mar 2017 01:21:47 +0000 (03:21 +0200)]
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>
2 years agoconfigure: remove redundant info
Clément Bœsch [Fri, 31 Mar 2017 09:30:38 +0000 (11:30 +0200)]
configure: remove redundant info

Based on d1a91ebe4990001e0800ee9ac54ed2207e4f56ff

2 years agoMerge commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff'
Clément Bœsch [Fri, 31 Mar 2017 09:24:11 +0000 (11:24 +0200)]
Merge commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff'

* commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff':
  configure: Print list of enabled programs

This commit is mostly a noop, see 832b4a4a438b73d720878d77aa3db46b08d79937

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '576c9003aef0fe18c0cf8da6e865211610552005'
Clément Bœsch [Fri, 31 Mar 2017 09:01:33 +0000 (11:01 +0200)]
Merge commit '576c9003aef0fe18c0cf8da6e865211610552005'

* commit '576c9003aef0fe18c0cf8da6e865211610552005':
  configure: Improve output wording

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'a3483f79933e8f1fd99d524e3218688e14c59150'
Clément Bœsch [Fri, 31 Mar 2017 08:46:06 +0000 (10:46 +0200)]
Merge commit 'a3483f79933e8f1fd99d524e3218688e14c59150'

* commit 'a3483f79933e8f1fd99d524e3218688e14c59150':
  avconv: Drop stray leftover debug output

This commit is a noop, see a283665693e1c9804b2736545dba77d0ee342f9e

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '67deba8a416d818f3d95aef0aa916589090396e2'
Clément Bœsch [Fri, 31 Mar 2017 08:40:34 +0000 (10:40 +0200)]
Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'

* commit '67deba8a416d818f3d95aef0aa916589090396e2':
  Use avpriv_report_missing_feature() where appropriate

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '59d2b00d201935c16408a2917957d89a170fe58f'
Clément Bœsch [Fri, 31 Mar 2017 08:22:32 +0000 (10:22 +0200)]
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>
2 years agoMerge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'
Clément Bœsch [Fri, 31 Mar 2017 08:13:25 +0000 (10:13 +0200)]
Merge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'

* commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0':
  fate: checkasm: Split monolithic test into individual components

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '9498237049d15812cecb79df47b196c73013908b'
Clément Bœsch [Fri, 31 Mar 2017 08:06:13 +0000 (10:06 +0200)]
Merge commit '9498237049d15812cecb79df47b196c73013908b'

* commit '9498237049d15812cecb79df47b196c73013908b':
  checkasm: Add --test parameter to check only specific components

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1'
Clément Bœsch [Fri, 31 Mar 2017 08:03:48 +0000 (10:03 +0200)]
Merge commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1'

* commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1':
  mov: Read multiple stsd from DV

This commit is a noop, see a765ba647d3d5ecb7270011693cb5b171f9afd01

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '47a795727f5433f5238a8a244cf181f61ea5af2c'
Clément Bœsch [Fri, 31 Mar 2017 08:02:39 +0000 (10:02 +0200)]
Merge commit '47a795727f5433f5238a8a244cf181f61ea5af2c'

* commit '47a795727f5433f5238a8a244cf181f61ea5af2c':
  hevc: Support extradata changes from multiple stsd

This commit is a noop, see 25fcbf7a84a485ae358f3fb3519ed4e8a98459cd

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036'
Clément Bœsch [Fri, 31 Mar 2017 07:57:33 +0000 (09:57 +0200)]
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>
2 years agoMerge commit '5be21531119d7a97ebc706800d1608272ee5a507'
Clément Bœsch [Fri, 31 Mar 2017 07:53:35 +0000 (09:53 +0200)]
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>
2 years agoMerge commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0'
Clément Bœsch [Fri, 31 Mar 2017 07:50:12 +0000 (09:50 +0200)]
Merge commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0'

* commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0':
  lavc: Add hevc main10 profile to avconv cli

This commit is a noop, see 271afd632f4de87db99ec085e75446b648dc6e60

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'
Clément Bœsch [Fri, 31 Mar 2017 07:46:51 +0000 (09:46 +0200)]
Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'

* commit '17dac56b8fdd80c594c39b76de3f27a7949afbde':
  lavu: Rename ycgco color space appropriately

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1'
Clément Bœsch [Fri, 31 Mar 2017 07:44:04 +0000 (09:44 +0200)]
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>
2 years agopthread_frame: Propagate sw_pix_fmt across threads
Mark Thompson [Thu, 30 Mar 2017 21:58:59 +0000 (22:58 +0100)]
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>
2 years agoavutil/tests/dict: Check return of av_dict_parse_string()
Michael Niedermayer [Thu, 30 Mar 2017 21:07:52 +0000 (23:07 +0200)]
avutil/tests/dict: Check return of av_dict_parse_string()

Fixes: CID1396402

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/mov: Init ref_sc / ref_st to NULL
Michael Niedermayer [Thu, 30 Mar 2017 21:03:24 +0000 (23:03 +0200)]
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>
2 years agoavformat/libopenmpt: Check for avio_size() failure
Michael Niedermayer [Thu, 30 Mar 2017 20:55:28 +0000 (22:55 +0200)]
avformat/libopenmpt: Check for avio_size() failure

Fixes CID1396850

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/af_chorus & aecho: Handle NULL return from av_strtok()
Michael Niedermayer [Thu, 30 Mar 2017 20:12:13 +0000 (22:12 +0200)]
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>
2 years agoavcodec/clearvideo: Do not lose the return code of decode_mb()
Michael Niedermayer [Thu, 30 Mar 2017 20:12:12 +0000 (22:12 +0200)]
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>
2 years agoMerge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'
Clément Bœsch [Thu, 30 Mar 2017 21:23:40 +0000 (23:23 +0200)]
Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'

* commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301':
  avplay: Correct function pointer assignments in options array

This commit is a noop, see a9a1bc56abf1fa79104996bf7b98b12ca42cd32c

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'
Clément Bœsch [Thu, 30 Mar 2017 21:22:52 +0000 (23:22 +0200)]
Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'

* commit '943533d64c7fa7a1b2fc9559e67652c349d21d51':
  avconv: Correct function pointer assignments in options array

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '43de8b328b62cf21ec176c3989065168da471a5f'
Clément Bœsch [Thu, 30 Mar 2017 21:22:07 +0000 (23:22 +0200)]
Merge commit '43de8b328b62cf21ec176c3989065168da471a5f'

* commit '43de8b328b62cf21ec176c3989065168da471a5f':
  lzf: update pointer p after realloc

This commit is a noop, see bb6a7b6f75ac544c956e3eefee297700ef4d3468

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'
Clément Bœsch [Thu, 30 Mar 2017 21:21:31 +0000 (23:21 +0200)]
Merge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'

* commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c':
  swscale: Add GRAY12

This commit is a noop, see 19be5fb7286b02fbe384f12fe4aa5c376d43d2e1

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '7471352f1915813cda725ce624607d84b5a3a61c'
Clément Bœsch [Thu, 30 Mar 2017 21:18:56 +0000 (23:18 +0200)]
Merge commit '7471352f1915813cda725ce624607d84b5a3a61c'

* commit '7471352f1915813cda725ce624607d84b5a3a61c':
  pixfmt: Add GRAY12

This commit is a noop, see 638b216d4f54a330d0fad6cc7e1f4ec066594abe

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'
Mark Thompson [Thu, 30 Mar 2017 21:07:57 +0000 (22:07 +0100)]
Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'

* commit '4ab61cd983b539749bd621ea271624ddb5196a8e':
  qsv{enc,dec}: extend the internal frame allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
2 years agoMerge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'
Mark Thompson [Thu, 30 Mar 2017 21:06:03 +0000 (22:06 +0100)]
Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'

* commit '00aeedd84105a17f414185bd33ecadebeddb3a27':
  qsv{dec,enc}: use a struct as a memory id with internal memory allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
2 years agoMerge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'
Mark Thompson [Thu, 30 Mar 2017 21:00:03 +0000 (22:00 +0100)]
Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'

* commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c':
  qsv{dec,enc}: always use an internal mfxFrameSurface1

Minor fixups for differences in the QSV encoder because of a53cc.

Merged-by: Mark Thompson <sw@jkqxz.net>
2 years agoMerge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'
Mark Thompson [Thu, 30 Mar 2017 20:54:46 +0000 (21:54 +0100)]
Merge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'

* commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6':
  hwcontext_qsv: support frame mapping

Merged-by: Mark Thompson <sw@jkqxz.net>
2 years agoavfilter/vf_minterpolate: Use dx and dy
Michael Niedermayer [Thu, 30 Mar 2017 20:24:47 +0000 (22:24 +0200)]
avfilter/vf_minterpolate: Use dx and dy

Fixes CID1396283 and CID1396284

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/deshake_opencl: Remove redundant return
Michael Niedermayer [Thu, 30 Mar 2017 20:21:29 +0000 (22:21 +0200)]
avfilter/deshake_opencl: Remove redundant return

Fixes: CID1396846

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/af_sofalizer: Fix bad shift
Michael Niedermayer [Thu, 30 Mar 2017 20:15:21 +0000 (22:15 +0200)]
avfilter/af_sofalizer: Fix bad shift

Fixes CID1396835

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'
Mark Thompson [Thu, 30 Mar 2017 20:18:23 +0000 (21:18 +0100)]
Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'

* commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d':
  hwcontext_qsv: transfer data through the child context when VPP fails

Merged-by: Mark Thompson <sw@jkqxz.net>
2 years agoMerge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'
Mark Thompson [Thu, 30 Mar 2017 20:16:58 +0000 (21:16 +0100)]
Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'

* commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68':
  hwcontext_qsv: do not fail when download/upload VPP session creation fails

Merged-by: Mark Thompson <sw@jkqxz.net>
2 years agoMerge commit 'b115a35ea62b8f479b48d99a601f0e157517301e'
Mark Thompson [Thu, 30 Mar 2017 20:16:09 +0000 (21:16 +0100)]
Merge commit 'b115a35ea62b8f479b48d99a601f0e157517301e'

* commit 'b115a35ea62b8f479b48d99a601f0e157517301e':
  hwcontext_qsv: add support for the P8 format

Merged-by: Mark Thompson <sw@jkqxz.net>
2 years agoavcodec/atrac3: Check init_get_bits8() for failure
Michael Niedermayer [Thu, 30 Mar 2017 17:00:00 +0000 (19:00 +0200)]
avcodec/atrac3: Check init_get_bits8() for failure

This is more for correctness than actually fixing a missing error path

Fixes CID1399967

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/avf_abitscope: Correct range for framerate
Gyan Doshi [Thu, 23 Mar 2017 13:34:30 +0000 (19:04 +0530)]
avfilter/avf_abitscope: Correct range for framerate

Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)
2 years agodoc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum...
Michael Niedermayer [Thu, 30 Mar 2017 13:12:19 +0000 (15:12 +0200)]
doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum sample rate

This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffmpeg: Fix avframe memleak
Michael Niedermayer [Thu, 30 Mar 2017 14:13:22 +0000 (16:13 +0200)]
ffmpeg: Fix avframe memleak

Fixes CID1401674

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/mux: Check return code of av_packet_split_side_data()
Michael Niedermayer [Thu, 30 Mar 2017 13:58:32 +0000 (15:58 +0200)]
avformat/mux: Check return code of av_packet_split_side_data()

Fixes CID1403225

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/examples/filtering_audio: switch to new decoding API
Matthieu Bouron [Wed, 29 Mar 2017 14:25:24 +0000 (16:25 +0200)]
doc/examples/filtering_audio: switch to new decoding API

2 years agodoc/examples/filtering_video: switch to new decoding API
Matthieu Bouron [Wed, 29 Mar 2017 12:58:01 +0000 (14:58 +0200)]
doc/examples/filtering_video: switch to new decoding API

2 years agodoc/codecs: add jedec-p22
Clément Bœsch [Thu, 30 Mar 2017 11:59:15 +0000 (13:59 +0200)]
doc/codecs: add jedec-p22

2 years agoavformat/nut: Add HEVC and Opus support
Leo Izen [Tue, 28 Mar 2017 21:07:47 +0000 (17:07 -0400)]
avformat/nut: Add HEVC and Opus support

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42'
Hendrik Leppkes [Thu, 30 Mar 2017 09:37:39 +0000 (11:37 +0200)]
Merge commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42'

* commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42':
  hwcontext_dxva2: add support for the P8 format

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit '910973765417f06a4a9ccbd006e4df74c32ecb01'
Hendrik Leppkes [Thu, 30 Mar 2017 09:33:51 +0000 (11:33 +0200)]
Merge commit '910973765417f06a4a9ccbd006e4df74c32ecb01'

* commit '910973765417f06a4a9ccbd006e4df74c32ecb01':
  hwcontext_dxva2: frame mapping support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'
Clément Bœsch [Thu, 30 Mar 2017 09:13:08 +0000 (11:13 +0200)]
Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'

* commit 'fabfbfe5710050812147f93a351a53fdda56ff8c':
  dxva2: fix surface selection when compiled with both d3d11va and dxva2

This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'db0b3dccb3842de134721e8d5c275f56d384340d'
Clément Bœsch [Thu, 30 Mar 2017 09:10:11 +0000 (11:10 +0200)]
Merge commit 'db0b3dccb3842de134721e8d5c275f56d384340d'

* commit 'db0b3dccb3842de134721e8d5c275f56d384340d':
  libx265: Add option to force IDR frames

This commit is a noop, see 8a8902f2213b28a8dab1520bd42e88e5073f1f59

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '3cba09e5228c889d63814dc43bc68f15c9dbac77'
Clément Bœsch [Thu, 30 Mar 2017 09:07:09 +0000 (11:07 +0200)]
Merge commit '3cba09e5228c889d63814dc43bc68f15c9dbac77'

* commit '3cba09e5228c889d63814dc43bc68f15c9dbac77':
  x86: Drop stray semicolons after function definitions

This commit is a noop, they are already fixed in FFmpeg.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d'
Clément Bœsch [Thu, 30 Mar 2017 09:04:12 +0000 (11:04 +0200)]
Merge commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d'

* commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d':
  configure: Silence lld-link when getting the version number

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '392caa65df3efa8b2d48a80f08a6af4892c61c08'
Clément Bœsch [Thu, 30 Mar 2017 08:59:10 +0000 (10:59 +0200)]
Merge commit '392caa65df3efa8b2d48a80f08a6af4892c61c08'

* commit '392caa65df3efa8b2d48a80f08a6af4892c61c08':
  arm: vp9mc: Insert a literal pool at the middle of the file

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '8ad9f9d675eab139aa2208722009eeed981460dd'
Clément Bœsch [Thu, 30 Mar 2017 08:55:32 +0000 (10:55 +0200)]
Merge commit '8ad9f9d675eab139aa2208722009eeed981460dd'

* commit '8ad9f9d675eab139aa2208722009eeed981460dd':
  hwcontext_vaapi: Frame mapping support

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966'
Clément Bœsch [Thu, 30 Mar 2017 08:41:24 +0000 (10:41 +0200)]
Merge commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966'

* commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966':
  lavfi: Hardware map filter

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0'
Clément Bœsch [Thu, 30 Mar 2017 08:36:37 +0000 (10:36 +0200)]
Merge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0'

* commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0':
  hwcontext: Hardware frame mapping

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '67351924fa91dea4339109100a4c0689f006581f'
Clément Bœsch [Thu, 30 Mar 2017 08:26:29 +0000 (10:26 +0200)]
Merge commit '67351924fa91dea4339109100a4c0689f006581f'

* commit '67351924fa91dea4339109100a4c0689f006581f':
  Drop unreachable break and return statements

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '99434f4df81b6801b2b535d5b9143305595784f6'
Clément Bœsch [Thu, 30 Mar 2017 08:23:25 +0000 (10:23 +0200)]
Merge commit '99434f4df81b6801b2b535d5b9143305595784f6'

* commit '99434f4df81b6801b2b535d5b9143305595784f6':
  float_dsp: Have implementation match function pointer prototype

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '6354957a95022864746180525680cca872ab0e0a'
Clément Bœsch [Thu, 30 Mar 2017 08:21:37 +0000 (10:21 +0200)]
Merge commit '6354957a95022864746180525680cca872ab0e0a'

* commit '6354957a95022864746180525680cca872ab0e0a':
  dnxhdenc: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'
Clément Bœsch [Thu, 30 Mar 2017 08:14:21 +0000 (10:14 +0200)]
Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'

* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
  pixblockdsp: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '99ddeddc7fc996c0c1e842112928490e78542bd5'
Clément Bœsch [Thu, 30 Mar 2017 08:12:43 +0000 (10:12 +0200)]
Merge commit '99ddeddc7fc996c0c1e842112928490e78542bd5'

* commit '99ddeddc7fc996c0c1e842112928490e78542bd5':
  ituh263dec: Have function signature match across declaration and definition

This commit is a noop, see 2d2b363c652403ac0bda129912e1910aacdaa3fc

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'
Clément Bœsch [Thu, 30 Mar 2017 08:07:00 +0000 (10:07 +0200)]
Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'

* commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481':
  vf_hwupload_cuda: Fix build error

This commit is a noop, see 78e871ebbcc6f3c877e7292c4dda0c9979f8ede4

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2'
Clément Bœsch [Thu, 30 Mar 2017 08:06:01 +0000 (10:06 +0200)]
Merge commit '13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2'

* commit '13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2':
  svq3: Drop unused function dctcoef_get()

This commit is a noop, see 1e298e77240099aa45bb8c955ee0313392227f42

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'ee59f0540875ab42496af2aacddd942757707683'
Clément Bœsch [Thu, 30 Mar 2017 08:03:59 +0000 (10:03 +0200)]
Merge commit 'ee59f0540875ab42496af2aacddd942757707683'

* commit 'ee59f0540875ab42496af2aacddd942757707683':
  intrax8: Have function signature match across declaration and definition

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '1a469a5e423bdad779b8534247dea8cc86169b88'
Clément Bœsch [Thu, 30 Mar 2017 07:58:09 +0000 (09:58 +0200)]
Merge commit '1a469a5e423bdad779b8534247dea8cc86169b88'

* commit '1a469a5e423bdad779b8534247dea8cc86169b88':
  options_table: Remove a now unnecessary include of config.h

This commit is a noop, see 76f43cbe2648ac5cb0e5a146f7e843310002199a

Merged-by: Clément Bœsch <cboesch@gopro.com>