ffmpeg.git
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>
2 years agoMerge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'
James Almer [Fri, 31 Mar 2017 20:39:25 +0000 (17:39 -0300)]
Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'

* commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8':
  qsv: Add VC-1 decoder

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

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

* commit 'fea4dc05b41f5465bedc786b67966f204ec6150c':
  vc1: Return stream format information from parser

This commit is a noop, see 4df6605da7e351116c99f19b8a98e1f236932600

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

* commit '0940b748bdba36c4894fc8ea6be631d821fdf578':
  qsvdec: Only warn about unconsumed data if it happens more than once

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '030d84fa2e35af0e77516735de35bf1a52371c86'
James Almer [Fri, 31 Mar 2017 20:12:09 +0000 (17:12 -0300)]
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 1f26a231bb065276cd80ce02957c759f3197edfa

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'
James Almer [Fri, 31 Mar 2017 20:08:50 +0000 (17:08 -0300)]
Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'

* commit '3297577f3eac1c87d48dedd527942de2bd28e7a5':
  mpegvideo: Return correct coded frame sizes from parser

This commit is a noop, see 309fe16a126c6c00cc60070de3190cf23f5570fb

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97'
James Almer [Fri, 31 Mar 2017 20:01:34 +0000 (17:01 -0300)]
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
b4dc7c341eb08b6a4d5470a05364eadf85434108
f1212e472b5f57b4f7243fc46f254647cf7e284d

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29'
James Almer [Fri, 31 Mar 2017 19:56:19 +0000 (16:56 -0300)]
Merge commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29'

* commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29':
  aarch64: vp9: Add NEON itxfm routines

This commit is a noop, see f43079e11cb445e6b70b149d9cdb829091ec2155

Merged-by: James Almer <jamrial@gmail.com>
2 years agodoc/decode_audio: use <> to include libav* headers
James Almer [Fri, 31 Mar 2017 19:50:39 +0000 (16:50 -0300)]
doc/decode_audio: use <> to include libav* headers

Found-by: ubitux
2 years agoMerge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'
James Almer [Fri, 31 Mar 2017 19:46:00 +0000 (16:46 -0300)]
Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'

* commit '01348e411f962f5e4605d649fc9a47a54587ba8e':
  avconv_opt: Consistently iterate through hwaccels array in all cases

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'
James Almer [Fri, 31 Mar 2017 19:38:37 +0000 (16:38 -0300)]
Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'

* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6':
  Drop pointless void* casts

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd316f9cefcd854071985c6f524a9a15348240264'
James Almer [Fri, 31 Mar 2017 19:33:48 +0000 (16:33 -0300)]
Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'

* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'
James Almer [Fri, 31 Mar 2017 19:28:35 +0000 (16:28 -0300)]
Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'

* commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67':
  vf_drawtext: Drop wrong void* cast

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'
James Almer [Fri, 31 Mar 2017 19:25:23 +0000 (16:25 -0300)]
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>
2 years agoMerge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'
James Almer [Fri, 31 Mar 2017 19:19:30 +0000 (16:19 -0300)]
Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'

* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
  ratecontrol: Use correct function pointer casts instead of void*

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

* commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973':
  arm: vp9: Add NEON loop filters

This commit is a noop, see 6bec60a683a530ac3bf5a19e5c3d087b5dd047a1

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'
James Almer [Fri, 31 Mar 2017 19:13:04 +0000 (16:13 -0300)]
Merge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'

* commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e':
  libxvid: Check return value of write() call

This commit is a noop, see 25f35df11583800ee296effd42c51c65e9f3ef72

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

* commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9':
  libxvid: Use proper context in av_log() calls

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5'
James Almer [Fri, 31 Mar 2017 19:05:53 +0000 (16:05 -0300)]
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>
2 years agoMerge commit 'a67ae67083151f2f9595a1f2d17b601da19b939e'
James Almer [Fri, 31 Mar 2017 19:00:31 +0000 (16:00 -0300)]
Merge commit 'a67ae67083151f2f9595a1f2d17b601da19b939e'

* commit 'a67ae67083151f2f9595a1f2d17b601da19b939e':
  arm: vp9: Add NEON itxfm routines

This commit is a noop, see b4dc7c341eb08b6a4d5470a05364eadf85434108

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

* commit '0b37cd09a67c3ba4db044404b99c65a32b4ad932':
  checkasm: add vp9dsp.itxfm_add tests.

This commit is a noop, see 0b227c6d4725d580feeea7d04c07bee26600df1b

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

* commit 'fd0fae60372cddbe0bec8830d07e760195f80bad':
  pthread_frame: Unreference hw_frames_ctx on per-thread codec contexts

This commit is a noop, see fb69a8e1f124ee89e924344bfb7934937abed642

Merged-by: James Almer <jamrial@gmail.com>
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>