1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

84108 Commits

Author SHA1 Message Date
Clément Bœsch
ca619cdf54 Merge commit '221402c1c88b9d12130c6f5834029b535ee0e0c5'
* commit '221402c1c88b9d12130c6f5834029b535ee0e0c5':
  pcx: check that the packet is large enough before reading the header

See 8cd1c0febe

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:55:06 +01:00
Clément Bœsch
2da66630dc Merge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'
* commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b':
  pcx: properly pad the scanline

This commit is a noop, see d24de4596c

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:51:56 +01:00
Clément Bœsch
d707e667c5 Merge commit '409d1cd2c955485798f8b0b0147c2b899b9144ec'
* commit '409d1cd2c955485798f8b0b0147c2b899b9144ec':
  cook: use the bytestream2 API for reading extradata

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:47:19 +01:00
Clément Bœsch
a0220d949f Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'
* commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b':
  qpeg: fix an off by 1 error in the MV check

See dd3bfe3cc1

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:39:49 +01:00
Clément Bœsch
f09aa73b30 Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'
* commit '796dca027be09334d7bbf4f2ac1200e06bb054cb':
  alac: do not return success if nothing was decoded

See e11983bda0

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:36:37 +01:00
Clément Bœsch
1080b7162f Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'
* commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b':
  vmnc: check that subrectangles fit into their containing rectangles

See 6ba02602aa

This merge keeps our condition against w-i and h-j instead of bw and bh.
One may be more correct than the other, but I'm keeping our behaviour
here for safety reasons.

The style and formatting is merged.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:24:49 +01:00
Clément Bœsch
01e188762f Merge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'
* commit '83b92a855e8e08bdec484e13ee5a7c8996224772':
  golomb: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:41 +01:00
Clément Bœsch
a754fae4a7 Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'
* commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c':
  simple_idct: arm: Drop disabled code variant

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:07 +01:00
Clément Bœsch
8695ce73ca Merge commit 'e2b9993558b6adee42dcc6eb385a14943aaca974'
* commit 'e2b9993558b6adee42dcc6eb385a14943aaca974':
  simple_idct: x86: Drop disabled IDCT implementation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:11:11 +01:00
Clément Bœsch
ff66ba6feb Merge commit '7effebde78977fafce935776153ea2f7c0981fa3'
* commit '7effebde78977fafce935776153ea2f7c0981fa3':
  dvbsubdec: Remove disabled, near-duplicate debug code

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:10:17 +01:00
Clément Bœsch
b2c5f5054b Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'
* commit '93fed46a92bab8be176d3e67be4354189a8dbe7f':
  timefilter: test: Drop some disabled debug cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:08:27 +01:00
Clément Bœsch
adef752f1b Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'
* commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65':
  mpegvideo: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:07:30 +01:00
Clément Bœsch
95a29b1a82 Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'
* commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c':
  msmpeg4: Drop disabled debug cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:06:49 +01:00
Clément Bœsch
87cd8dc0b0 Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'
* commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e':
  mathops: Drop disabled alternative mid_pred() implementation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:05:13 +01:00
Clément Bœsch
56d63208d8 Merge commit 'be3363f664d7314d55b42860bd4077154752d769'
* commit 'be3363f664d7314d55b42860bd4077154752d769':
  nsv: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:04:46 +01:00
Clément Bœsch
1a48a51bfc Merge commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c'
* commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c':
  mjpegdec: Drop disabled code

The last chunk is replaced with a comment describing the structure.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:03:25 +01:00
Clément Bœsch
7a6514861e Merge commit '34c22a9ca656603428b2c3490d1339c5a5966961'
* commit '34c22a9ca656603428b2c3490d1339c5a5966961':
  faan(i)dct: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:00:21 +01:00
Clément Bœsch
83706367e2 Merge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'
* commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0':
  wc3movie: Drop unused cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:59:49 +01:00
Clément Bœsch
2f42aef3e4 Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'
* commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710':
  ffv1: Remove broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:58:43 +01:00
Clément Bœsch
b6e88bf323 Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'
* commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661':
  h264: Kill broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:56:19 +01:00
Clément Bœsch
842e7853c7 Merge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'
* commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e':
  aac: Drop broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:54:44 +01:00
Clément Bœsch
92cd2c04b1 Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'
* commit '263efc095e6c7ec2902119118b084cea29ea8916':
  jfdct: Kill broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:50:17 +01:00
Clément Bœsch
3eed90b1ed Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'
* commit 'd9442d13033a24b14ebae149dcdb42709430e2d9':
  rm: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:49:47 +01:00
Clément Bœsch
4ded6f9b31 Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'
* commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358':
  roqvideoenc: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:49:15 +01:00
Clément Bœsch
8a403b00d1 Merge commit '562bec0e690760fb93deb2843a7237713103a191'
* commit '562bec0e690760fb93deb2843a7237713103a191':
  pnm_parser: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:48:50 +01:00
Clément Bœsch
18cdef9ab7 Merge commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c'
* commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c':
  wma: Kill non-compiling disabled cruft

See 0755033f8a

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:42:55 +01:00
Clément Bœsch
8e950c9b42 Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'
* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
  swscale: Kill non-compiling disabled cruft

The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.

The SWS_X chunk is merged, with an additional cosmetic.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:40:03 +01:00
Clément Bœsch
efcba5a06a Merge commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf'
* commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf':
  mpeg4videoenc: Kill non-compiling disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:48:07 +01:00
Clément Bœsch
3f04964671 Merge commit 'e4d5b55193109d08be47c42d320334546c006b51'
* commit 'e4d5b55193109d08be47c42d320334546c006b51':
  rangecoder: Kill non-compiling disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:44:04 +01:00
Muhammad Faiz
de1308429a swresample/x86/resample: extend resample_double to support avx and fma3
benchmark:
sse2 10.670s
avx   8.763s
fma3  8.380s

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-03-19 12:24:41 +07:00
Clément Bœsch
3d5c2169e4 Merge commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815'
* commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815':
  mathematics: Kill non-compiling disabled cruft

This commit is a noop, see 1e1513d01a

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 23:51:51 +01:00
Clément Bœsch
ea8efc9594 lavu/mathematics: split closing bracket out of ifdefery 2017-03-18 23:50:05 +01:00
Clément Bœsch
1e1513d01a lavu/mathematics: document so-called "cruft" 2017-03-18 23:50:03 +01:00
Clément Bœsch
2c400ba7d1 Merge commit '5a667322f5cb0e77c15891fc06725c19d8f3314f'
* commit '5a667322f5cb0e77c15891fc06725c19d8f3314f':
  vaapi_vc1: Remove redundant version check

This commit is a noop, see d07d01bcce

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:07:39 +01:00
Clément Bœsch
e788c50ce2 Merge commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d'
* commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d':
  vaapi_vc1: Constify pointers

This commit is a noop, see 845c2c140b

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:07:01 +01:00
Clément Bœsch
a6a6ed54d8 Merge commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29'
* commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29':
  vaapi_mpeg2: Constify pointers

This commit is a noop, see 6bc2808c41

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:05:36 +01:00
Clément Bœsch
54d839e80a Merge commit '03adfe913062c6995136eb1ca51152b6d596c0f4'
* commit '03adfe913062c6995136eb1ca51152b6d596c0f4':
  vaapi_h264: Constify pointers

This commit is a noop, see d0897da924

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:03:10 +01:00
Clément Bœsch
77d590cd9c Merge commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f'
* commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f':
  hwcontext_vaapi: Try the first render node as the default DRM device

This commit is a noop, see 8d47d84075

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:02:10 +01:00
Clément Bœsch
bd37ffdbb2 Merge commit '6fc944e6136b050bf965f847bbfd69e1fe572f82'
* commit '6fc944e6136b050bf965f847bbfd69e1fe572f82':
  Prepare for 12_alpha1 Release

This commit is a noop.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:01:22 +01:00
Clément Bœsch
55dae222a0 Merge commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5'
* commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5':
  avconv: Make sure that inputless filtergraphs are configured

This commit is a noop. Related code is pretty different in ffmpeg, and
-filter_complex testsrc works.

See also af1761f7b5

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:00:06 +01:00
Clément Bœsch
e3b81d2d9b Merge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'
* commit '602abe77b02f9702c18c2787d208fcfc9d94b70f':
  avconv: Check the fifo allocation

This commit is a noop, see af1761f7b5

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:45:11 +01:00
Clément Bœsch
9821aa7d38 Merge commit 'f2143c57b6a61fef382f3128138d8558a9bdecee'
* commit 'f2143c57b6a61fef382f3128138d8558a9bdecee':
  vp9: reindent after last commit
  vp9: add frame threading
  vp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically.
  vp9: split last/cur_frame from the reference buffers.

This commit is a noop, we already have all these changes. Again, we will
need in the future to analyse the tiny differences between the two
repository on the vp9 files. But in the current state, it's a real pain
to do at every commit due to the huge differences (such as files split
and cosmetics).

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:38:52 +01:00
Clément Bœsch
39d2b48757 Merge commit '04763c6f87690b31cfcd0d324cf36a451531dcd0'
* commit '04763c6f87690b31cfcd0d324cf36a451531dcd0':
  h264_direct: use the reference mask from the actual reference

This commit is a noop, see d8151a7e94

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:32:05 +01:00
Clément Bœsch
822f1a7913 Merge commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225'
* commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225':
  lavc: free buffer_frame/pkt on avcodec_open2() failure

This commit is a noop, see 27adf9f9cd.

Only reordered to reduce diff.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:27:56 +01:00
Clément Bœsch
53587ca482 Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'
* commit 'ec021d48445a414325ad59a73f9cde3212b173e4':
  buffer: fix av_buffer_pool_init2() documentation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:22:30 +01:00
James Almer
824d4062a1 compat/atomics/gcc: use __typeof__ instead of typeof
The typeof keyword is apparently not available when using the -std=c99 option.

Fixes the use of C11 atomic functions with old GCC.

Reviewed-by: Muhammad Faiz <mfcc64@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-18 12:13:46 -03:00
Rostislav Pehlivanov
3796fb2692 lavfi: deprecate AVFilterGraph->resample_lavr_opts
Not used by anything at all since we don't auto insert lavr filters.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-03-18 07:37:35 +00:00
Muhammad Faiz
c52638cca2 swresample/swresample: do not use s32p internally by default when resampling
use fltp when doing s32 -> s32 resampling
because s32p has no simd optimization

benchmark:
old 17.913s
new  7.584s (use fma3)

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-03-18 13:57:03 +07:00
Carl Eugen Hoyos
9e6b269fea lavc/avcodec: Constify AVBitStreamFilter* in AVBitStreamFilterContext struct.
Fixes a gcc warning:
libavcodec/bitstream_filter.c:71:20: warning: assignment discards 'const' qualifier from pointer target type
2017-03-17 23:46:47 +01:00
Vittorio Giovara
95a72aed76 mov: Drop extra format specifier in error message 2017-03-17 15:30:11 -04:00