Commit Graph

85029 Commits

Author SHA1 Message Date
Steven Liu 99e5d81ef9 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>
2017-04-01 10:55:04 +08:00
James Almer 6171f178e7 x86/hevc_add_res: merge last remaining changes from 3d65359832
See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html
2017-03-31 20:49:45 -03:00
James Almer b62a87591e doc/libav-merge: link to the relevant ml thread in the extract_extradata line 2017-03-31 20:35:16 -03:00
Martin Vignali 6426f74272 fate/exr : add test for uint32 data
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 23:09:55 +02:00
James Almer 678ab33861 Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'
* commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8':
  qsv: Add VC-1 decoder

See fb57bc6c34.
Merged for cosmetic purposes to reduce differences with libav.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:42:12 -03:00
James Almer 99fa2fc5db Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'
* commit 'fea4dc05b41f5465bedc786b67966f204ec6150c':
  vc1: Return stream format information from parser

This commit is a noop, see 4df6605da7

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:18:37 -03:00
James Almer 4fe9d69648 Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'
* commit '0940b748bdba36c4894fc8ea6be631d821fdf578':
  qsvdec: Only warn about unconsumed data if it happens more than once

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:16:39 -03:00
James Almer 1fb2c697d5 Merge commit '030d84fa2e35af0e77516735de35bf1a52371c86'
* commit '030d84fa2e35af0e77516735de35bf1a52371c86':
  qsvdec: Pass field order information to libmfx
  qsvdec: Pass the correct profile to libmfx

These commits are a noop, see 1f26a231bb

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:12:09 -03:00
James Almer b00f44e513 Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'
* commit '3297577f3eac1c87d48dedd527942de2bd28e7a5':
  mpegvideo: Return correct coded frame sizes from parser

This commit is a noop, see 309fe16a12

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:08:50 -03:00
James Almer c6f06876e1 Merge commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97'
* commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97':
  aarch64: vp9: loop_filter: fix typo in skip flatout8 check
  aarch64: vp9: Implement NEON loop filters
  arm: vp9itxfm: Simplify txfm string comparisons

These commits are a noop, see
b4dc7c341e
f1212e472b

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:01:34 -03:00
James Almer 74927355fc Merge commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29'
* commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29':
  aarch64: vp9: Add NEON itxfm routines

This commit is a noop, see f43079e11c

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:56:19 -03:00
James Almer b27dd80255 doc/decode_audio: use <> to include libav* headers
Found-by: ubitux
2017-03-31 16:50:51 -03:00
James Almer 10eb3259a6 Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'
* commit '01348e411f962f5e4605d649fc9a47a54587ba8e':
  avconv_opt: Consistently iterate through hwaccels array in all cases

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:46:00 -03:00
James Almer b725b482c6 Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'
* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6':
  Drop pointless void* casts

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:38:37 -03:00
James Almer fc2a94219d Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'
* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:33:48 -03:00
James Almer a4ee955113 Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'
* commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67':
  vf_drawtext: Drop wrong void* cast

This commit is a noop, see 4c96985af1

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:28:35 -03:00
James Almer 8e7497e774 Merge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'
* commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125':
  nut: Use correct function pointer casts instead of void*

This commit is a noop. Casts are not needed.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:25:23 -03:00
James Almer c4fd1e7b01 Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'
* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
  ratecontrol: Use correct function pointer casts instead of void*

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:19:30 -03:00
James Almer 66e7b421fa Merge commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973'
* commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973':
  arm: vp9: Add NEON loop filters

This commit is a noop, see 6bec60a683

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:17:41 -03:00
James Almer a1afcf8b8c Merge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'
* commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e':
  libxvid: Check return value of write() call

This commit is a noop, see 25f35df115

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:13:04 -03:00
James Almer 804ae6e30f Merge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9'
* commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9':
  libxvid: Use proper context in av_log() calls

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:10:32 -03:00
James Almer ef516efad4 Merge commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5'
* commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5':
  libxvid: Require availability of mkstemp()

This commit is a noop. Our libxvid wrapper doesn't use mkstemp().

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:05:53 -03:00
James Almer 037522a75a Merge commit 'a67ae67083151f2f9595a1f2d17b601da19b939e'
* commit 'a67ae67083151f2f9595a1f2d17b601da19b939e':
  arm: vp9: Add NEON itxfm routines

This commit is a noop, see b4dc7c341e

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:00:31 -03:00
James Almer 5e7288480f Merge commit '0b37cd09a67c3ba4db044404b99c65a32b4ad932'
* commit '0b37cd09a67c3ba4db044404b99c65a32b4ad932':
  checkasm: add vp9dsp.itxfm_add tests.

This commit is a noop, see 0b227c6d47

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:58:01 -03:00
James Almer a9134fa713 Merge commit 'fd0fae60372cddbe0bec8830d07e760195f80bad'
* commit 'fd0fae60372cddbe0bec8830d07e760195f80bad':
  pthread_frame: Unreference hw_frames_ctx on per-thread codec contexts

This commit is a noop, see fb69a8e1f1

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:52:57 -03:00
James Almer bf624e993d Merge commit '11623217e3c9b859daee544e31acdd0821b61039'
* commit '11623217e3c9b859daee544e31acdd0821b61039':
  arm: vp9mc: Use a different helper register for PIC loads

This commit is a noop, see 68caef9d48

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:50:22 -03:00
James Almer f6e37665a9 Merge commit '824e8c284054f323f854892d1b4739239ed1fdc7'
* commit '824e8c284054f323f854892d1b4739239ed1fdc7':
  arm: Clear the gp register alias at the end of functions

This commit is a noop, see 86c5a23ee5

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:48:52 -03:00
James Almer ebe9808aaa Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'
* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:46:13 -03:00
James Almer 67eda469ab Merge commit '6a62795d4051f435a9a2c59395d96913693922f8'
* commit '6a62795d4051f435a9a2c59395d96913693922f8':
  aarch64: h264idct: Use the offset parameter to movrel

This commit is a noop, see da5c8284c0

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:43:28 -03:00
James Almer 8408c2efe4 Merge commit '557c1675cf0e803b2fee43b4c8b58433842c84d0'
* commit '557c1675cf0e803b2fee43b4c8b58433842c84d0':
  arm: vp9mc: Minor adjustments from review of the aarch64 version

This commit is a noop, see 68caef9d48

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:40:41 -03:00
James Almer 2348eb1714 Merge commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc'
* commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc':
  aarch64: vp9: Add NEON optimizations of VP9 MC functions

This commit is a noop, see 1f7801c2bc

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:35:31 -03:00
James Almer 183635b9e9 doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska 2017-03-31 15:33:48 -03:00
James Almer afac31d2b2 Merge commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c'
* commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c':
  aarch64: Add an offset parameter to the movrel macro

This commit is a noop, see 7fe898dbb9

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:23:11 -03:00
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