1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

84936 Commits

Author SHA1 Message Date
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
Clément Bœsch
aac40dd615 Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'
* commit '943533d64c7fa7a1b2fc9559e67652c349d21d51':
  avconv: Correct function pointer assignments in options array

This commit is a noop, see 4c96985af1

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:22:52 +02:00
Clément Bœsch
9813df1189 Merge commit '43de8b328b62cf21ec176c3989065168da471a5f'
* commit '43de8b328b62cf21ec176c3989065168da471a5f':
  lzf: update pointer p after realloc

This commit is a noop, see bb6a7b6f75

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:22:07 +02:00
Clément Bœsch
62e46fac26 Merge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'
* commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c':
  swscale: Add GRAY12

This commit is a noop, see 19be5fb728

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:21:31 +02:00
Clément Bœsch
719f1a923f Merge commit '7471352f1915813cda725ce624607d84b5a3a61c'
* commit '7471352f1915813cda725ce624607d84b5a3a61c':
  pixfmt: Add GRAY12

This commit is a noop, see 638b216d4f

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:18:56 +02:00
Mark Thompson
ff821fdfce Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'
* commit '4ab61cd983b539749bd621ea271624ddb5196a8e':
  qsv{enc,dec}: extend the internal frame allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 22:07:57 +01:00
Mark Thompson
c0f2a8eac1 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>
2017-03-30 22:06:03 +01:00
Mark Thompson
2f18e452f8 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>
2017-03-30 22:00:03 +01:00
Mark Thompson
e3f9c5826a Merge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'
* commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6':
  hwcontext_qsv: support frame mapping

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:54:46 +01:00
Michael Niedermayer
855305fac2 avfilter/vf_minterpolate: Use dx and dy
Fixes CID1396283 and CID1396284

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Michael Niedermayer
4798237f01 avfilter/deshake_opencl: Remove redundant return
Fixes: CID1396846

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Michael Niedermayer
4064f3f0df avfilter/af_sofalizer: Fix bad shift
Fixes CID1396835

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Mark Thompson
546524056d Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'
* commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d':
  hwcontext_qsv: transfer data through the child context when VPP fails

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:18:23 +01:00
Mark Thompson
7cb082ac2f Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'
* commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68':
  hwcontext_qsv: do not fail when download/upload VPP session creation fails

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:16:58 +01:00
Mark Thompson
59b1942aae Merge commit 'b115a35ea62b8f479b48d99a601f0e157517301e'
* commit 'b115a35ea62b8f479b48d99a601f0e157517301e':
  hwcontext_qsv: add support for the P8 format

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:16:09 +01:00
Michael Niedermayer
e976e68fc5 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>
2017-03-30 22:13:38 +02:00
Gyan Doshi
2104e3383f 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)
2017-03-30 10:29:14 -08:00
Michael Niedermayer
59b8c2a4e6 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>
2017-03-30 16:34:06 +02:00
Michael Niedermayer
004f27f0fb ffmpeg: Fix avframe memleak
Fixes CID1401674

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:34:06 +02:00
Michael Niedermayer
8779ec91b2 avformat/mux: Check return code of av_packet_split_side_data()
Fixes CID1403225

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:30:14 +02:00
Matthieu Bouron
03372d0a90 doc/examples/filtering_audio: switch to new decoding API 2017-03-30 16:20:13 +02:00