wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
84434 commits 40 branches 405 tags 230 MiB
Commit graph

84434 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Biurrun
6ff3da4f6a Place attribute_deprecated in the right position for struct declarations 
libavcodec/vaapi.h:58:1: warning: attribute 'deprecated' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]

(cherry picked from commit ed6a891c36)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-22 19:07:32 +00:00
Clément Bœsch
e28bd75f7c lavc/hevc: use atomics for wpp_err 2017-03-22 18:38:27 +01:00
Rostislav Pehlivanov
38d7cc22f7 mdct15: fix left shift of a negative value 
Should fix Chromium issue 704064.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-03-22 17:21:34 +00:00
Clément Bœsch
cf1c8a379e lavc/bitstream_filter: remove unused atomic.h include 2017-03-22 18:17:44 +01:00
Clément Bœsch
cb763a9ba8 lavc/bitstream: remove unused atomic.h include 2017-03-22 18:16:58 +01:00
Clément Bœsch
9ce031c37f Merge commit '59c7022740' 
* commit '59c7022740':
  pthread_frame: use atomics for frame progress

This commit is a noop, see b6587421c7

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 18:13:47 +01:00
Clément Bœsch
5aee649919 Merge commit '64a31b2854' 
* commit '64a31b2854':
  pthread_frame: use atomics for PerThreadContext.state

This commit is a noop, see 7492626932

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 18:12:21 +01:00
Clément Bœsch
e6c868befa Merge commit 'db2733256d' 
* commit 'db2733256d':
  pthread_frame: use a thread-safe way for signalling threads to die

This commit is a noop, see 4845f0720e

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 18:09:54 +01:00
Clément Bœsch
82d6179a88 Merge commit '8385ba53f1' 
* commit '8385ba53f1':
  mmaldec: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 18:01:51 +01:00
Clément Bœsch
b7336faa39 Merge commit '3a165c187d' 
* commit '3a165c187d':
  v4l2: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 17:55:18 +01:00
Clément Bœsch
443e969293 Merge commit '27079a426c' 
* commit '27079a426c':
  buffer: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 17:46:01 +01:00
Clément Bœsch
67d8eabdbb lavu/buffer: drop USE_ATOMICS 
USE_ATOMICS is only set if there is no thread implementation enabled, in
which case you can't expect any lock mechanism from FFmpeg.

This is also conflicting with the incoming use of stdatomic.
 2017-03-22 17:40:03 +01:00
Clément Bœsch
f015711ed1 Merge commit 'eb34d40354' 
* commit 'eb34d40354':
  Add a compat dummy stdatomic.h used when threading is disabled
  Add a compat stdatomic.h implementation based on pthreads
  Add a compat stdatomic.h implementation based on suncc atomics
  Add a compat stdatomic.h implementation based on windows atomics
  Add a compat stdatomic.h implementation based on GCC atomics

This merge is a noop, see:
  41e891e89e Add a compat dummy stdatomic.h used when threading is disabled
  74b5f10862 Add a compat stdatomic.h implementation based on pthreads
  70faadc826 Add a compat stdatomic.h implementation based on suncc atomics
  c91e72ed52 Add a compat stdatomic.h implementation based on windows atomics
  3359eede8f Add a compat stdatomic.h implementation based on GCC atomics

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 16:42:53 +01:00
Clément Bœsch
2d6f7e6c74 Merge commit '13f5d2bf75' 
* commit '13f5d2bf75':
  configure: check for stdatomic.h

This commit is a noop, see 6a4e24280d

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 16:41:29 +01:00
Clément Bœsch
34389e8472 Merge commit 'b015872c0d' 
* commit 'b015872c0d':
  huffyuvdsp: Enable the altivec code for PPC little-endian as well

This commit is a noop, see 902ce2a6c4 and
libavcodec/ppc/lossless_videodsp_altivec.c

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 16:37:37 +01:00
Clément Bœsch
7a11e6b2fd Merge commit '1d25a86902' 
* commit '1d25a86902':
  huffyuvdsp: Reenable PPC optimizations

This commit is a noop, see 6596b34954

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 16:35:13 +01:00
Clément Bœsch
7c2a7f9c11 Merge commit '22c3ab1864' 
* commit '22c3ab1864':
  checkasm: Add test for huffyuvdsp add_bytes

huffyuvdsp is renamed to llviddsp to be consistent with our codebase.

Note: af607b7e07 wasn't actually required for this test since this
commit is not actually testing huffyuvdsp.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 16:31:38 +01:00
Clément Bœsch
af607b7e07 lavc/huffyuvdsp: only transmit the pix_fmt instead of the whole avctx 
Only the pixel format is required in that init function. This will also
simplify the incoming merge.
 2017-03-22 16:22:20 +01:00
Clément Bœsch
c7904af057 lavc/huffyuvdsp: remove unused ppc init prototype 2017-03-22 16:15:42 +01:00
Clément Bœsch
928db51344 Merge commit '27085d1b47' 
* commit '27085d1b47':
  avconv: only retry decoding on actual decoding errors

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 16:05:06 +01:00
Clément Bœsch
204b4a7ee2 Merge commit 'f6772e9bf8' 
* commit 'f6772e9bf8':
  avconv: make sure the filtergraph is freed on init failure

This commit is a noop, see 16abc10b09

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 15:53:38 +01:00
Clément Bœsch
97c17cafab Merge commit 'd10102d23c' 
* commit 'd10102d23c':
  avconv: set the encoding framerate when the output is CFR

This commit is a noop, see 8db301dead

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 15:50:37 +01:00
Clément Bœsch
17f2c0abea Merge commit '5bf2454e7c' 
* commit '5bf2454e7c':
  h264dec: support broken files with mp4 extradata/annex b data

This commit is a noop, see 93b89868e1

The sample pointed out on
https://github.com/HandBrake/HandBrake/issues/339 decodes fine in
FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 15:49:13 +01:00
James Almer
0dbfed08d0 fate: update ref file for apng-clock test 2017-03-22 10:27:46 -03:00
Clément Bœsch
4205010240 Merge commit '2124711b95' 
* commit '2124711b95':
  hwcontext_vaapi: add a quirk for the missing MemoryType attribute

This commit is a noop, see 775a8477b7

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 12:59:20 +01:00
Clément Bœsch
c66bd8f3ff Merge commit 'b57e38f52c' 
* commit 'b57e38f52c':
  ac3dsp: x86: Replace inline asm for in-decoder downmixing with standalone asm

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 12:49:29 +01:00
Clément Bœsch
9dc57688c8 lavc/mips: temporally disable ac3 downmix 2017-03-22 11:46:13 +01:00
Clément Bœsch
ce10e4cb1f doc/libav-merge: create a special "extra changes" section 2017-03-22 11:43:00 +01:00
Clément Bœsch
fd5e1d132b Merge commit 'a9ba59591e' 
* commit 'a9ba59591e':
  ac3dsp: Add some special-case handling for the C downmix function

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 11:30:53 +01:00
Clément Bœsch
e39d4ff150 Merge commit '43717469f9' 
* commit '43717469f9':
  ac3dsp: Reverse matrix in/out order in downmix()

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 11:29:46 +01:00
Steven Liu
8ddadf56f6 avformat/rtmpproto: change rtmp_open from url_open to url_open2 
use the option set by user

Reported-by: Lancelot Lai <laihy23@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-03-22 18:06:14 +08:00
James Almer
aee046a895 x86/audiodsp: remove an unnecessary movss 2017-03-22 00:14:56 -03:00
Matthias Hunstock
b3a2adaac6 avdevice/decklink: new option 'format_code' to set video format by fourCC 
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-03-22 02:07:50 +01:00
Matthias Hunstock
607bffbed2 avdevice/decklink: add format_code of display mode to list_format output 
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-03-22 02:07:47 +01:00
Jun Zhao
9365dfcbf6 hwcontext: fix comments for av_hwdevice_ctx_alloc() 
fix the wrong comments for av_hwdevice_ctx_alloc()

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-22 00:58:42 +00:00
Marton Balint
5154650413 avcodec/avcodec.h: clarify decoupled decode/encode API docs 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-03-22 00:43:06 +01:00
James Almer
7bfbb72299 avformat/apng: set max_fps to no limit by default 
Should fix ticket #6252

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-21 19:15:19 -03:00
James Almer
874eb012f7 avformat/apng: fix setting frame delay when max_fps is set to no limit 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-21 19:15:12 -03:00
James Almer
d8962ffbd8 avutil/x86util: don't use movss in VBROADCASTSS macro when src and dst args are the same 
Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-21 19:15:00 -03:00
James Almer
fc9f14c7de Merge commit '8ea35af762' 
* commit '8ea35af762':
  avio: add a new flag for marking streams seekable by timestamp

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 17:07:44 -03:00
James Almer
de36e98a16 Merge commit '75c1db6152' 
* commit '75c1db6152':
  avio: cosmetics, prettify AVIO_SEEKABLE_NORMAL

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 17:04:44 -03:00
James Almer
4de591e6fb Merge commit '83548fe894' 
* commit '83548fe894':
  lavf: fix usage of AVIOContext.seekable

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 17:02:30 -03:00
Michael Niedermayer
423375d4f0 avcodec/wavpack: Check shift 
Fixes: runtime error: shift exponent 255 is too large for 32-bit type 'unsigned int'
Fixes: 894/clusterfuzz-testcase-4841537823309824

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-21 20:54:27 +01:00
Michael Niedermayer
b15818642b avcodec/mpegaudiodec_template: Fix 2 runtime error: signed integer overflow 
Fixes: 873/clusterfuzz-testcase-5714546230558720

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-21 20:52:08 +01:00
James Almer
387d96fcf5 Merge commit '8d1267932c' 
* commit '8d1267932c':
  x86/h264_weight: use appropriate register size for weight parameters

This commit is a noop, see 5ae0ad001a

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 16:10:33 -03:00
James Almer
9a0fbb9ca9 Merge commit '2caa93b813' 
* commit '2caa93b813':
  mpegaudiodsp: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 16:04:22 -03:00
James Almer
a0478341f3 Merge commit '15b4f494fc' 
* commit '15b4f494fc':
  mss*: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 15:57:07 -03:00
James Almer
b16752f694 Merge commit 'a339e919ca' 
* commit 'a339e919ca':
  ea: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 15:55:44 -03:00
James Almer
1e18548826 Merge commit 'ba479f3daa' 
* commit 'ba479f3daa':
  hevc: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 15:49:09 -03:00
James Almer
a8474df944 Merge commit 'e4a94d8b36' 
* commit 'e4a94d8b36':
  h264chroma: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 15:20:45 -03:00