1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00

82445 Commits

Author SHA1 Message Date
Hendrik Leppkes
3dfe97a841 Merge commit '2ef87815fec059504370ae3050cc243a53553915'
* commit '2ef87815fec059504370ae3050cc243a53553915':
  hwcontext_dxva2: add support for p010

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:15:19 +01:00
Hendrik Leppkes
d4509495bf Merge commit 'e78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8'
* commit 'e78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8':
  swscale: add P010 input support

This commit is a noop, see 2e31434d84bba17610ecc491afb5b372678fd517

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:09:31 +01:00
Hendrik Leppkes
8fee823fe8 Merge commit 'b7c5f885233a7b8692140c920d9f43220dc830d9'
* commit 'b7c5f885233a7b8692140c920d9f43220dc830d9':
  pixfmt: add P010 pixel format

This commit is a noop, see c2869b4640f0af56e2dd828406d074ef6290fde4

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:08:19 +01:00
Hendrik Leppkes
166f2c52ac Merge commit 'b55566db4c51d920a6496455bb30a608e5a50a41'
* commit 'b55566db4c51d920a6496455bb30a608e5a50a41':
  avconv: use avcodec_parameters_copy() with streamcopy

The fate-aac-autobsf-adtstoasc changes from writing an audio bitdepth
based on the sample format, which is now available.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 14:56:52 +01:00
Hendrik Leppkes
06136275e5 Merge commit 'be3e807c8fad1f82766c083073e44396799f155b'
* commit 'be3e807c8fad1f82766c083073e44396799f155b':
  oggparseopus: export pre-skip

Noop, we already export this information

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 14:03:47 +01:00
Carl Eugen Hoyos
9648ce2a18 lavf/Makefile: Fix rule for the data muxer. 2016-11-14 13:33:22 +01:00
Hendrik Leppkes
d8ffdefbdc Merge commit '029cf99c5166b36f33381cd8ebfa5f1f1f463d1f'
* commit '029cf99c5166b36f33381cd8ebfa5f1f1f463d1f':
  mov: Save number of stsd elements after stream extradata allocation

Mostly noop, see 8b43ee4054af799e388d380b379a13a60849c1b5

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 12:41:32 +01:00
Hendrik Leppkes
985bc8b496 Merge commit '6c445990e64124ad64c79423dfd3764520648c89'
* commit '6c445990e64124ad64c79423dfd3764520648c89':
  tiffenc: Check zlib support for deflate option during initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 12:32:08 +01:00
Hendrik Leppkes
bebab21176 Merge commit '9f732e4c996243c1e57c2bbbec6c8b94c37a7a22'
* commit '9f732e4c996243c1e57c2bbbec6c8b94c37a7a22':
  tiffenc: Check av_pix_fmt_desc_get() return value

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 12:30:35 +01:00
Hendrik Leppkes
bbd0ebfd83 Merge commit 'd8f3b0fb584677d4882e3a2d7c28f8b15c7319f5'
* commit 'd8f3b0fb584677d4882e3a2d7c28f8b15c7319f5':
  targaenc: Move size check to initialization function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 12:16:32 +01:00
Hendrik Leppkes
25004c7e6e Merge commit 'eeb6849cedac099d41feb482da581f4059c63ca7'
* commit 'eeb6849cedac099d41feb482da581f4059c63ca7':
  rle: K&R formatting cosmetics

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 12:03:00 +01:00
Hendrik Leppkes
444e65299b Merge commit '326d9116936ab61d13ac4142b49c7337daf7c4c0'
* commit '326d9116936ab61d13ac4142b49c7337daf7c4c0':
  build: Drop unnecessary libavcodec <-> libavformat object dependencies

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 12:01:17 +01:00
Hendrik Leppkes
a0bc6b51d4 Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'
* commit 'e72d6fa08a3c1876109149401753a8d2c736d418':
  build: Move MP2 muxer declaration away from MP3 muxer code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 11:20:15 +01:00
Hendrik Leppkes
cd70ffaac8 Merge commit '67cb2c0f73ec08bdcecd675c1ffe25c3a5b26ef2'
* commit '67cb2c0f73ec08bdcecd675c1ffe25c3a5b26ef2':
  checkasm: hevc: Iterate over features first, then over bitdepths

Noop, we don't have these checkasm tests.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 10:50:50 +01:00
Hendrik Leppkes
9b4cc0f35c Merge commit 'fe27792fd779ac4cdd5e57be5f6f488483c307b2'
* commit 'fe27792fd779ac4cdd5e57be5f6f488483c307b2':
  build: Move ff_mpeg12_frame_rate_tab to a separate file

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 10:42:36 +01:00
Carl Eugen Hoyos
0674d1938e lavc/hevc_ps: Use correct pix_fmt for 10bit 4:0:0.
Fixes the second sample from ticket #5544.
2016-11-14 10:36:25 +01:00
Carl Eugen Hoyos
b5177c7051 lsws: Add GRAY10 conversion.
Based on 19be5fb7 by Luca Barbato.
2016-11-14 10:35:06 +01:00
Carl Eugen Hoyos
3f1b5ca22e lavu/pixfmt: Add GRAY10
Based on 7471352f by Luca Barbato.
2016-11-14 10:16:41 +01:00
Hendrik Leppkes
575e8d11f1 Merge commit '8c929037ec75fbe9f367e0a31ee34839e92de481'
* commit '8c929037ec75fbe9f367e0a31ee34839e92de481':
  build: Add a new component for H.264 parsing code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 10:09:44 +01:00
Hendrik Leppkes
a81b9c6012 Merge commit '3c08b7bc761b6411f55db68189721638dde2c46a'
* commit '3c08b7bc761b6411f55db68189721638dde2c46a':
  ffv1: Report additional bitstream information in verbose mode

Noop, we already have bitstream information printing.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 10:05:43 +01:00
Hendrik Leppkes
5a45f4d2b7 Merge commit 'fe6e5cbea7dbd5d2c67d79b5570e26debb70e95b'
* commit 'fe6e5cbea7dbd5d2c67d79b5570e26debb70e95b':
  ffv1: Remove version 2 and mark version 3 as non-experimental

Noop, our ffv1 decoder is far more advanced and version 3 has been stable for a while.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 10:03:30 +01:00
Hendrik Leppkes
8ef6ba69c7 Merge commit '7c55fac7dfa8bad9644dea5d03309da30be69563'
* commit '7c55fac7dfa8bad9644dea5d03309da30be69563':
  fate: Add test for webp

Noop, we already have a variety of webp tests, including a fate-webp target,
which would collide with this test.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 10:02:33 +01:00
Rodger Combs
f8e3ebde56
lavf/mux: don't warn about missing timestamps on attached pictures 2016-11-14 01:45:02 -06:00
Dmitry Kalinkin
dc23e359ef lavc/audiotoolboxdec: fix OSX SDK detection
__MAC_10_11 can be present in updated revision of an older SDK so it
can't reliably detect availability of kAudioFormatEnhancedAC3 constant.

Fixes: b4daa2c40f ('lavc/audiotoolboxdec: add eac3 decoder')
Cc: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Previous version reviewed by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-14 02:35:26 +01:00
Kyle Swanson
83b6b434ff lavfi/ebur128: use ff_ prefix
Signed-off-by: Kyle Swanson <k@ylo.ph>
2016-11-13 19:11:07 -06:00
Simon Thelen
cd5da01daa doc/ffmpeg: add documentation for the disposition option
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-14 01:46:37 +01:00
Carl Eugen Hoyos
b1367f7e5e lavc/dpx: Support GRAY12 colourspace. 2016-11-14 00:33:12 +01:00
Hendrik Leppkes
f75035b06f Merge commit 'e48746deec48e9ff195841bc3266b4e153a878cd'
* commit 'e48746deec48e9ff195841bc3266b4e153a878cd':
  checkasm: h264dsp: Move the x and y variables into the randomize_buffer macro

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 23:02:39 +01:00
Hendrik Leppkes
af8b174711 Merge commit 'e57de6faa1e796099091c9af947d4755edacccaf'
* commit 'e57de6faa1e796099091c9af947d4755edacccaf':
  checkasm: h264dsp: Initialize the padding area

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 23:00:07 +01:00
Hendrik Leppkes
b2554e61e0 Merge commit '82b7525173f20702a8cbc26ebedbf4b69b8fecec'
* commit '82b7525173f20702a8cbc26ebedbf4b69b8fecec':
  Add an OpenH264 decoder wrapper

This commit is a noop, see c5d326f551b0312ff581bf1df35b21d956e01523

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:59:35 +01:00
Hendrik Leppkes
8fad4b4e25 Merge commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05'
* commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05':
  movenc: Apply offsets on timestamps when peeking into interleaving queues

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:57:02 +01:00
Hendrik Leppkes
fb40daa7f3 Merge commit 'eccfb9778ae939764d17457f34338d140832d9e1'
* commit 'eccfb9778ae939764d17457f34338d140832d9e1':
  qsvdec_hevc: add the UID of the HEVC HW decoder plugin

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:38:45 +01:00
Hendrik Leppkes
a478ae3938 Merge commit 'c67594a2c7fd4381e6d44246b18487c7e6b75f02'
* commit 'c67594a2c7fd4381e6d44246b18487c7e6b75f02':
  qsvdec_hevc: fix a variable name

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:38:29 +01:00
Hendrik Leppkes
3aa7b0a273 Merge commit 'f62bb216ac4cfbbff16108c6bac35a0282532972'
* commit 'f62bb216ac4cfbbff16108c6bac35a0282532972':
  hwcontext_vaapi: allow transfers to/from any size of sw frame

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:36:18 +01:00
Hendrik Leppkes
1f8e1c209d Merge commit 'c3f113d58488df7594a489bdbb993a69ad47063c'
* commit 'c3f113d58488df7594a489bdbb993a69ad47063c':
  vf_hwdownload: allocate the destination frame for the pool size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:35:57 +01:00
Hendrik Leppkes
7071924cf2 Merge commit 'fdfe01365d579189d9a55b3741dba2ac46eb1df8'
* commit 'fdfe01365d579189d9a55b3741dba2ac46eb1df8':
  hwcontext: allocate the destination frame for the pool size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:35:49 +01:00
Hendrik Leppkes
72c38dd66e Merge commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498'
* commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498':
  hwcontext: clarify the behaviour of transfer_data() for cropped frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:35:04 +01:00
Hendrik Leppkes
e3d9bd7102 doc/libav-merge: add skipped fixup commits to the list of missing changes 2016-11-13 22:34:01 +01:00
Hendrik Leppkes
cd47bd835a Merge commit '94ebf5565849e4dc036d2ca43979571ed3736457'
* commit '94ebf5565849e4dc036d2ca43979571ed3736457':
  avconv: restructure sending EOF to filters

Noop, as its a fixup to a previously skipped commit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:33:05 +01:00
Hendrik Leppkes
07dcef9bc7 Merge commit 'd2e56cf753a6c462041dee897d9d0c90f349988c'
* commit 'd2e56cf753a6c462041dee897d9d0c90f349988c':
  avconv: move flushing the queued frames to configure_filtergraph()

Noop, as its a fixup to a previously skipped commit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:32:48 +01:00
Hendrik Leppkes
bd0db4a32d Merge commit '7a745f014f528d1001394ae4d2f4ed1a20bf7fa2'
* commit '7a745f014f528d1001394ae4d2f4ed1a20bf7fa2':
  options_table: Add aliases for color properties

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 22:29:04 +01:00
Anton Khirnov
775a8477b7 hwcontext_vaapi: add a quirk for the missing MemoryType attribute
The Intel binary iHD driver does not support the
VASurfaceAttribMemoryType, so surface allocation will fail when using
it.

(cherry picked from commit 2124711b950b03c582a119c75f52a87acc32d6ec)
2016-11-13 20:39:49 +00:00
Mark Thompson
8d47d84075 hwcontext_vaapi: Try the first render node as the default DRM device
If no string argument is supplied when av_hwdevice_ctx_create() is
called to create a VAAPI device, we currently only try the default
X11 display (that is, $DISPLAY) to find a device, and will therefore
fail in the absence of an X server to connect to.  Change the logic
to also look for a device via the first DRM render node (that is,
"/dev/dri/renderD128"), which is probably the right thing to use in
most simple configurations which only have one DRM device.

(cherry picked from commit 121f34d5f0c8d7d376829a467590fbbe4c228f4f)
2016-11-13 20:39:49 +00:00
Mark Thompson
1a359e5341 vf_scale_vaapi: Respect driver quirks around buffer destruction
(cherry picked from commit 582d4211e00015b68626f77ce4af53161e2b1713)
2016-11-13 20:39:48 +00:00
Mark Thompson
2dee500f4c vaapi_encode: Respect driver quirks around buffer destruction
No longer leaks memory when used with a driver with the "render does
not destroy param buffers" quirk (i.e. Intel i965).

(cherry picked from commit 221ffca6314ed3ba9d38464ea50cd85251c04e74)
Fixes ticket #5871.
2016-11-13 20:39:48 +00:00
Mark Thompson
a8d51bb424 hwcontext_vaapi: Add driver quirks to the hwdevice
The driver being used is detected inside av_hwdevice_ctx_init() and
the quirks field then set from a table of known device.  If this
behaviour is unwanted, the user can also set the quirks field
manually.

Also adds the Intel i965 driver quirk (it does not destroy parameter
buffers used in a call to vaRenderPicture()) and detects that driver
to set it.

(cherry picked from commit 4926fa9a4aa03f3b751f52e900b9efb87fea0591)
2016-11-13 20:39:48 +00:00
Andreas Cadhalpun
25012c5644 filmstripdec: correctly check image dimensions
This prevents a division by zero in read_packet.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-11-13 19:18:14 +01:00
Mark Thompson
03cef34aa6 ffmpeg_qsv: Fix hwaccel transcoding
Set up the encoder with a hardware context which will match the one
the decoder will use when it starts later.

Includes 02c2761973dfc886e94a60a9c7d6d30c296d5b8c, with additional
hackery to get around a3a0230a9870b9018dc7415ae5872784d524cfe5 being
skipped.
2016-11-13 17:49:48 +00:00
Hendrik Leppkes
411ecb0be6 Merge commit '444a36269f853844369af0a9836507e5a2780323'
* commit '444a36269f853844369af0a9836507e5a2780323':
  pixdesc: Fix AVCOL_TRC_BT2020_12 name

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 18:38:16 +01:00
Hendrik Leppkes
2d7cf6f72b Merge commit 'f172e22d6aed0bff36e975bafb0183b6779f9444'
* commit 'f172e22d6aed0bff36e975bafb0183b6779f9444':
  pixdesc: Add aliases to SMPTE color properties

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-13 18:35:28 +01:00