1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00

82479 Commits

Author SHA1 Message Date
Martin Storsjö
86c5a23ee5 arm: Clear the gp register alias at the end of functions
We reset .Lpic_gp to zero at the start of each function, which means
that the logic within movrelx for clearing gp when necessary will
be missed.

This fixes using movrelx in different functions with a different
helper register.

This is cherry-picked from libav commit
824e8c284054f323f854892d1b4739239ed1fdc7.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2016-11-15 15:10:03 -05:00
Martin Storsjö
6409e9b6cc vp9dsp: Deduplicate the subpel filters
Make them aligned, to allow efficient access to them from simd.

This is an adapted cherry-pick from libav commit
a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2016-11-15 15:10:03 -05:00
Michael Niedermayer
2baf36caed avcodec/ituh263dec: Avoid spending a long time in slice sync
Fixes: 177/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_FLV1_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-15 18:27:31 +01:00
Ronald S. Bultje
83a139e3d8 vp9: add avx2 iadst16 implementations.
Also a small cosmetic change to the avx2 idct16 version to make it
explicit that one of the arguments to the write-out macros is unused
for >=avx2 (it uses pmovzxbw instead of punpcklbw).
2016-11-15 11:01:36 -05:00
Michael Niedermayer
0eb3198005 avcodec/movtextdec: Add error message for tsmb_size check
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-15 15:08:20 +01:00
Michael Niedermayer
a609905723 avcodec/movtextdec: Fix tsmb_size check==0 check
Fixes: 173/fuzz-3-ffmpeg_SUBTITLE_AV_CODEC_ID_MOV_TEXT_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-15 15:08:20 +01:00
Michael Niedermayer
6ea2715768 avcodec/movtextdec: Fix potential integer overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-15 15:08:20 +01:00
Andreas Cadhalpun
0edd569466 softfloat: handle -INT_MAX correctly
This is similar to commit 9ac61e73d0843ec4b83f4e3d47eded73234e406e.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-11-14 22:57:07 +01:00
Martin Vignali
d0d6902444 doc/filters: add metadata information for blackframe
Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Lou Logan <lou@lrcd.com>
2016-11-14 11:59:52 -09:00
James Almer
2d9433ded9 doc/codecs.texi: add new and missing color related options
Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-11-14 15:15:53 -03:00
Hendrik Leppkes
47f75839e4 Merge commit 'f8d17d53957056c053a46f9320fa7ae6fe1479a5'
* commit 'f8d17d53957056c053a46f9320fa7ae6fe1479a5':
  checkasm: Add tests for vp8dsp

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:29:08 +01:00
Hendrik Leppkes
51f5542c77 Merge commit 'e8b96a77010dd62624c3c65c357d7ae3b397ceaa'
* commit 'e8b96a77010dd62624c3c65c357d7ae3b397ceaa':
  arm: Fix a typo in a comment

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:21:49 +01:00
Hendrik Leppkes
5a447edd47 Merge commit 'dc08bbf63a217c839aa4c143f2a1d0b7e2e6d997'
* commit 'dc08bbf63a217c839aa4c143f2a1d0b7e2e6d997':
  vp8dsp: Clarify the first dimension of the mc function tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:21:24 +01:00
Hendrik Leppkes
68b0d7e0be Merge commit '924e2ecd2b7d51cca60c79351ef16b04dd4245c3'
* commit '924e2ecd2b7d51cca60c79351ef16b04dd4245c3':
  qsvdec: when a frames ctx is supplied, use its frame dimensions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:20:09 +01:00
Hendrik Leppkes
3c81fa9a9c Merge commit '92736c74fb1633e36f7134a880422a9b7db14d3f'
* commit '92736c74fb1633e36f7134a880422a9b7db14d3f':
  qsvdec: add support for P010 (10-bit 420) decoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:20:00 +01:00
Hendrik Leppkes
220e773915 Merge commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991'
* commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991':
  qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:19:51 +01:00
Hendrik Leppkes
1bc6cdf2fc Merge commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa'
* commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa':
  qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:19:43 +01:00
Hendrik Leppkes
e122a725fb Merge commit 'd20c118975220a0256027d1c2410bade94b8534d'
* commit 'd20c118975220a0256027d1c2410bade94b8534d':
  hwcontext_qsv: add support for p010

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:18:49 +01:00
Hendrik Leppkes
1535256813 Merge commit '40f74dc87acb3f5bbb51f273790a4a7a64201b16'
* commit '40f74dc87acb3f5bbb51f273790a4a7a64201b16':
  matroskadec: export CodecDelay

Noop, we already export CodecDelay

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:18:23 +01:00
Hendrik Leppkes
745a44ee61 Merge commit '582d4211e00015b68626f77ce4af53161e2b1713'
* commit '582d4211e00015b68626f77ce4af53161e2b1713':
  vf_scale_vaapi: Respect driver quirks around buffer destruction

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:16:56 +01:00
Hendrik Leppkes
190254f881 Merge commit '221ffca6314ed3ba9d38464ea50cd85251c04e74'
* commit '221ffca6314ed3ba9d38464ea50cd85251c04e74':
  vaapi_encode: Respect driver quirks around buffer destruction

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:16:39 +01:00
Hendrik Leppkes
6ace05beec Merge commit '4926fa9a4aa03f3b751f52e900b9efb87fea0591'
* commit '4926fa9a4aa03f3b751f52e900b9efb87fea0591':
  hwcontext_vaapi: Add driver quirks to the hwdevice

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:16:31 +01:00
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