eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-23 22:41:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
85,096 Commits 38 Branches 415 Tags
n3.4-dev
Commit Graph

37786 Commits

Author SHA1 Message Date
Michael Niedermayer
22b0daa1b3 Bump versions for master after 3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-02 19:54:12 +02:00
Michael Niedermayer
e1cc7f83df Bump minor for 3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-02 19:49:45 +02:00
James Almer
cbd2502939 avcodec/extract_extradata_bsf: make sure all parameter set NAL units were found for h264/hevc 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-04-01 17:59:06 -03:00
Paul B Mahol
358d4524cc avcodec/dnxhdenc: fix indentation issue 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-04-01 18:51:18 +02:00
Paul B Mahol
f078bc4c5e avcodec/dnxhdenc: DNxHR 444 and HQX support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-04-01 18:46:40 +02:00
Clément Bœsch
507a85b93c Merge commit 'adb0e941c329a4778ade6dd0a326274472992f54' 
* commit 'adb0e941c329a4778ade6dd0a326274472992f54':
  avpacket: Mark src pointer as constant

See 5bb3f88255

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-01 18:23:21 +02:00
Dzung Hoang
68e3c9a3b6 avcodec/exr: add support for scanline file where offsets are set to zero 2017-04-01 17:57:59 +02:00
Clément Bœsch
c7173e5098 Merge commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb' 
* commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb':
  qsvdec: Drop stray extra braces around initializer

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-01 15:15:19 +02:00
Clément Bœsch
a032c5224d Merge commit '715b8243460836fb7dd15bf7e41668e773beb276' 
* commit '715b8243460836fb7dd15bf7e41668e773beb276':
  qsv: Drop some unused variables

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-01 15:14:31 +02:00
Takayuki 'January June' Suwa
e3d8963c3c avcodec/dsddec: correct for DSD silence bit-ordering 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-01 12:51:00 +02:00
Clément Bœsch
52e6fb9c59 Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56' 
* commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56':
  golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-01 11:26:23 +02:00
Clément Bœsch
e06b8b07d5 Merge commit 'e0b164576f7467b7b1127c18175e215dc1df011f' 
* commit 'e0b164576f7467b7b1127c18175e215dc1df011f':
  qsv: Add VP8 decoder

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-01 11:21:02 +02:00
Clément Bœsch
f56a5fee37 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>
 2017-04-01 10:17:32 +02: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
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
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
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
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
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
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
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
Ronald S. Bultje
081c21ca55 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.
 2017-03-31 08:26:24 -04:00
Ronald S. Bultje
73f863d751 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.
 2017-03-31 08:26:23 -04:00
Ronald S. Bultje
9e2050b698 codec_desc: mark fraps as an intra-only codec. 
Fixes reported race conditions by tsan in fate-avio-direct.
 2017-03-31 08:26:23 -04:00
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
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
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
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
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
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
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
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
Clément Bœsch
03f5e80bdb Merge commit '67351924fa91dea4339109100a4c0689f006581f' 
* commit '67351924fa91dea4339109100a4c0689f006581f':
  Drop unreachable break and return statements

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:26:29 +02:00
Clément Bœsch
77248d1218 Merge commit '6354957a95022864746180525680cca872ab0e0a' 
* commit '6354957a95022864746180525680cca872ab0e0a':
  dnxhdenc: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:21:41 +02:00
Clément Bœsch
7b89015715 Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6' 
* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
  pixblockdsp: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:14:21 +02:00
Clément Bœsch
b76dd6a678 Merge commit 'ee59f0540875ab42496af2aacddd942757707683' 
* commit 'ee59f0540875ab42496af2aacddd942757707683':
  intrax8: Have function signature match across declaration and definition

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:03:59 +02:00
Martin Vignali
b4016ef31a avcodec/exr: add support for uint32 2017-03-29 23:28:35 +02:00
Clément Bœsch
a51867ee6b Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5' 
* commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5':
  bink: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 15:09:26 +02:00
Clément Bœsch
d467740f45 lavc/idctdsp: use prefix restrict with av_ 2017-03-29 15:07:29 +02:00
Clément Bœsch
eaa67bb9c0 lavc/pthread_slice: remove pointless condition 2017-03-29 14:49:29 +02:00
Clément Bœsch
549045254c Fix all -Wformat warnings raised by DJGPP 2017-03-29 14:49:29 +02:00
Clément Bœsch
2d12b910f7 lavc: use av_fourcc2str() where appropriate 2017-03-29 14:49:29 +02:00
Clément Bœsch
67e370ee52 lavc: fix usages of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00