Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-16 11:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
84564 commits 38 branches 415 tags 291 MiB
Commit graph

37597 commits

Author SHA1 Message Date
James Almer
7ebc9f8df4 Merge commit '89b35a139e' 
* commit '89b35a139e':
  lavc: add a bitstream filter for extracting extradata from packets

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-23 16:31:15 -03:00
James Almer
4a5810b659 Merge commit 'f6e2f8a9ff' 
* commit 'f6e2f8a9ff':
  hevcdec: move parameter set parsing into a separate header

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-23 15:53:00 -03:00
James Almer
b29c8c995f Merge commit '150c896a9e' 
* commit '150c896a9e':
  hevcdec: split ff_hevc_diag_scan* declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-23 15:14:06 -03:00
James Almer
5c6efaffd0 avcodec/hevc: add missing hevc.h header 
It was lost as part of a merge in 6397815be0.
 2017-03-23 15:07:28 -03:00
James Almer
6397815be0 Merge commit 'c359d624d3' 
* commit 'c359d624d3':
  hevcdec: move decoder-independent declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-23 14:27:48 -03:00
James Almer
a1a80a6c9c avcodec/bytestream: check for AV_HAVE_BIGENDIAN instead of HAVE_BIGENDIAN 
No need to include config.h for HAVE_BIGENDIAN when libavutil/avconfig.h
is already included.
 2017-03-23 14:26:44 -03:00
Timo Rothenpieler
d84c2298e2 avcodec/nvenc: apply quantization factors to cqp 2017-03-23 17:10:52 +01:00
Timo Rothenpieler
7fb2a7afa1 avcodec/nvenc: Deprecate usage of global_quality, introducing qp 2017-03-23 17:10:52 +01:00
Clément Bœsch
038e6aef7a Merge commit '4abe3b049d' 
* commit '4abe3b049d':
  hevc: rename hevc.[ch] to hevcdec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 16:48:41 +01:00
Clément Bœsch
cc012c46e8 Merge commit '14e7e19a90' 
* commit '14e7e19a90':
  lavc: bsf: Document input/output codecparam alloc/init process

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 16:03:43 +01:00
Clément Bœsch
947230837c Merge commit '112cee0241' 
* commit '112cee0241':
  hevc: Add SSE2 and AVX IDCT

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 15:58:46 +01:00
James Almer
05510ec067 avcodec/videotoolboxenc: remove unused atomic header 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-23 11:51:00 -03:00
James Almer
005da88c1e avcodec/mediacodec: convert to stdatomic 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-23 11:44:58 -03:00
Michael Niedermayer
4f727fbc73 avcodec/h264_ps: Fix runtime error: signed integer overflow: 2147483647 + 26 cannot be represented in type 'int' 
Fixes: 902/clusterfuzz-testcase-4561155144024064

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-23 15:25:48 +01:00
Michael Niedermayer
0f34c0789f avcodec/pictordec: runtime error: left shift of 15 by 28 places cannot be represented in type 'int' 
Fixes: 898/clusterfuzz-testcase-6149765467209728

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-23 15:25:48 +01:00
Michael Niedermayer
3182e19c1c avcodec/tiff: Check geotag count for being non zero 
Fixes memleak
Fixes: 874/clusterfuzz-testcase-5252796175613952

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-23 15:25:48 +01:00
Clément Bœsch
739d8c83f2 Merge commit '9b2ccafb48' 
* commit '9b2ccafb48':
  aarch64: Add missing sign extension in ff_h264_idct8_add_neon

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 12:15:39 +01:00
Clément Bœsch
733b13ad66 Merge commit 'e4128c08d7' 
* commit 'e4128c08d7':
  Revert "hevc: x86: Refactor IDCT macro declarations"

So apparently this was technically correct be reverted due to
authorship. Reverted as well in FFmpeg for now...

See http://lists.libav.org/pipermail/libav-devel/2016-October/079560.html

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 12:03:25 +01:00
Clément Bœsch
4bb4fa28e3 Merge commit '5801f9ed24' 
* commit '5801f9ed24':
  h264_intrapred: x86: Update comments left behind in 95c89da36e

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 11:58:01 +01:00
Clément Bœsch
9954d5b44e Merge commit 'd9dccc0389' 
* commit 'd9dccc0389':
  hevc: x86: Refactor IDCT macro declarations

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 11:54:53 +01:00
Clément Bœsch
5f044d2372 Merge commit 'c19830aa2c' 
* commit 'c19830aa2c':
  rscc: Support palette format

See 11777eb814

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 11:33:27 +01:00
Clément Bœsch
7b3a3e6276 Merge commit 'b8d5070db6' 
* commit 'b8d5070db6':
  avcodec: Document AV_PKT_DATA_PALETTE side data type

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 11:27:41 +01:00
wm4
7e4ba776a2 lavc: vdpau: Add support for new hw_frames_ctx and hw_device_ctx API 
This supports retrieving the device from a provided hw_frames_ctx, and
automatically creating a hw_frames_ctx if hw_device_ctx is set.

The old API is not deprecated yet. The user can still use
av_vdpau_bind_context() (with or without setting hw_frames_ctx), or use
the API before that by allocating and setting hwaccel_context manually.

Cherry-picked from Libav commit 1a7ddba5.
(Adds missing APIchanges entry to the Libav version.)

Reviewed-by: Mark Thompson <sw@jkqxz.net>
 2017-03-23 09:36:42 +01:00
wm4
156bd8278f lavc: Add hwaccel_flags field to AVCodecContext 
This "reuses" the flags introduced for the av_vdpau_bind_context() API
function, and makes them available to all hwaccels. This does not affect
the current vdpau API, as av_vdpau_bind_context() should obviously
override the AVCodecContext.hwaccel_flags flags for the sake of
compatibility.

Cherry-picked from Libav commit 16a163b5.

Reviewed-by: Mark Thompson <sw@jkqxz.net>
 2017-03-23 09:34:21 +01:00
James Almer
30cadfe071 avcodec/lossless_videodsp: use ptrdiff_t for length parameters 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-22 18:38:35 -03:00
Mark Thompson
9560766a61 vaapi_vp9: Mark as async-safe 2017-03-22 19:07:32 +00:00
Mark Thompson
14c1101518 vaapi_hevc: Mark as async-safe 2017-03-22 19:07:32 +00:00
Mark Thompson
81b7deab82 vaapi: Implement device-only setup 
In this case, the user only supplies a device and the frame context
is allocated internally by lavc.

(cherry picked from commit 5dd9a4b88b)
 2017-03-22 19:07:32 +00:00
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
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
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
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
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
James Almer
aee046a895 x86/audiodsp: remove an unnecessary movss 2017-03-22 00:14:56 -03: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
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
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
James Almer
5a49097b42 Merge commit '2ec9fa5ec6' 
* commit '2ec9fa5ec6':
  idct: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-21 14:29:52 -03:00