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

88178 Commits

Author SHA1 Message Date
James Almer
e08897619e avcodec/libxvid: make 4 the default for me_quality
This will make the default behavior the same as it was with me_method.
2017-10-21 18:36:40 -03:00
Mark Thompson
e7d20d5e35 movtextdec: Move declaration out of for initialisation statement 2017-10-21 22:19:50 +01:00
Mark Thompson
e0a967a405 cinepakenc: Move declaration out of for initialisation statement
(cherry picked from commit 92f0aceb36)
2017-10-21 22:19:50 +01:00
Mark Thompson
4dee92f6bc hevc: Fix aligned array declarations
(cherry picked from commit d41e10c148)
2017-10-21 22:19:50 +01:00
James Almer
5ae972f63b avcodec/v4l2_m2m_enc: fix usage of deprecated codec flag 2017-10-21 18:19:02 -03:00
James Almer
d3a3ee9c7a ffserver: remove usage of deprecated rc_eq option
The private codec option will be used instead when available.
2017-10-21 18:07:54 -03:00
Rostislav Pehlivanov
efb79cabb2 libavcodec/version: add a comment about FF_API_MPV_OPT deprecation
In order to prevent it from being forgotten and delayed until the next bump.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-10-21 21:02:35 +01:00
James Almer
75bd215727 avcodec/version: re-enable FF_API_MPV_OPT until the open ABI period is over
ffserver depends on it, so keep it in place until the two can be
removed together.
2017-10-21 16:53:46 -03:00
James Almer
c060ed02a8 Merge commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6'
* commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6':
  lavc: Drop deprecated chroma subsample function

This commit is a noop, see 2c800eb737

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:59:31 -03:00
James Almer
1198e34e11 Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'
* commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88':
  lavf: Drop deprecated hint to set muxer timebase

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:54:22 -03:00
James Almer
a295fee284 Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'
* commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a':
  lavf: Drop deprecated AVFract type and related field

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:51:11 -03:00
James Almer
f02bda3a03 Merge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'
* commit '5e71299758d3aa7c93c3cca618a8e048a9483794':
  lavf: Drop deprecated bitexact functionality

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:48:25 -03:00
James Almer
d1b1a65662 Merge commit '96a47364d1cf346a5d0437e054b1b10d44d8d969'
* commit '96a47364d1cf346a5d0437e054b1b10d44d8d969':
  lavfi: Drop deprecated non-const filter retrieval

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:40:14 -03:00
James Almer
de0b26ce28 Merge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'
* commit '8e18328b18e69b38a5feae5d10ad01b403a205b6':
  lavfi: Drop deprecated filter registration

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:37:34 -03:00
James Almer
5045cf27aa Merge commit '52067b3c0e5ddbcf7021a093420798420351a9e2'
* commit '52067b3c0e5ddbcf7021a093420798420351a9e2':
  lavfi: Drop deprecated filter initialization

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:35:14 -03:00
James Almer
7c4f63d05b Merge commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9'
* commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9':
  lavfi: Drop deprecated functions to open a filter or a filterchain

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:28:35 -03:00
James Almer
0ed61546c4 Merge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'
* commit '88fd836a015a5f3380df74592e440e7d1e5b8000':
  lavfi: Drop deprecated way of passing options for a few filters

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 15:27:03 -03:00
Carl Eugen Hoyos
ea049ad862 lavfi/graphparser: Constify a variable.
Fixes the following warning:
libavfilter/graphparser.c:122:10: warning: assignment discards 'const' qualifier from pointer target type
2017-10-21 20:24:49 +02:00
Carl Eugen Hoyos
535117d1f6 lavd/lavfi: Constify two variables.
Fixes the following warnings:
libavdevice/lavfi.c:136:16: warning: assignment discards 'const' qualifier from pointer target type
libavdevice/lavfi.c:137:17: warning: assignment discards 'const' qualifier from pointer target type
2017-10-21 20:22:52 +02:00
James Almer
69b5ce64d2 Merge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5'
* commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5':
  Bump major versions of all libraries

A few API deprecated ~2 years ago or more are also postponed here for
varying reasons.

FF_API_LOWRES:
Since this functionality depends on AVStream->codec, i figure the two can
be removed at the same time in the next bump or so.

FF_API_AVCTX_TIMEBASE:
Couldn't get this one to work. Not just libavcodec but apparently also
libavformat and ffmpeg.c expect AVCodecContext->time_base to be set for
decoding. Upon removal some tests report a different generic stream time
base (like 1/25), and others lose packet duration values. I guess it's
somehow tied to the AVStream->codec clusterfuck.
It can be dealt with alongside FF_API_LAVF_AVCTX in the next bump.

FF_API_OLD_FILTER_OPTS_ERROR:
This one is meant to remain after FF_API_OLD_FILTER_OPTS is removed.
Its purpose is displaying the corrected command line using the new syntax
as a suggestion as part of the error message.

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:57:53 -03:00
James Almer
4c0a8ff061 Merge commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008'
* commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008':
  flvdec: Set avg_frame_rate for video streams

This commit is a noop, see e0791c5aaf

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:34:24 -03:00
James Almer
072b14f390 Merge commit '8e2346154e6d58b733fd20326ce706f82fd91b3e'
* commit '8e2346154e6d58b733fd20326ce706f82fd91b3e':
  libavutil: Hook up the rest of the gcc specific attributes to clang as well

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:25:55 -03:00
James Almer
1ba5e456dd Merge commit '3aa9c523e9cf4f4a5e239ac737281e096c884907'
* commit '3aa9c523e9cf4f4a5e239ac737281e096c884907':
  libavutil: Define the noreturn attribute for clang in MSVC mode as well

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:21:12 -03:00
James Almer
157dc14951 Merge commit 'a46a4f722d2fac07c57990f0f548777622599f59'
* commit 'a46a4f722d2fac07c57990f0f548777622599f59':
  dca: Refactor dca_filter_channels() a little
  dca: Validate the channel map

This commit is a noop, we have a different DCA decoder.

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:19:07 -03:00
James Almer
2c96648109 Merge commit '3df77b58e35a30ed550f99936a308f6bd2f47a20'
* commit '3df77b58e35a30ed550f99936a308f6bd2f47a20':
  nvenc: Allow different const qps for I, P and B frames

This commit is a noop, see 2db5ab73d4

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:16:44 -03:00
James Almer
12b6166bcf Merge commit 'ca960161f087ca38267b88ce90592010c59584f1'
* commit 'ca960161f087ca38267b88ce90592010c59584f1':
  rtsp: Move message parsing to a separate function

This commit is a noop, see 1e27837265

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:14:26 -03:00
James Almer
a2a7b02fbd Merge commit 'bd805964f40f7af83da64645ba83d1e8060a1214'
* commit 'bd805964f40f7af83da64645ba83d1e8060a1214':
  configure: Do not treat JACK as a system library

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 14:10:39 -03:00
James Almer
9cfdf0e332 Merge commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb'
* commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb':
  avconv: Document the -init_hw_device option
  avconv: Enable generic hwaccel support for VDPAU
  lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx API
  lavc: Add hwaccel_flags field to AVCodecContext
  avconv: Enable generic hwaccel support for VAAPI
  avconv: Generic device setup
  hwcontext: Make it easier to work with device types
  hwcontext: Add device derivation

This commit is a noop, see
b22172f6f3
0b1794a43e
06043cc0bc
be51073352
156bd8278f
7e4ba776a2
e462ace84b
527a1e2131

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 13:37:07 -03:00
James Almer
5f84ad3ecc Merge commit 'b864230c49089b087eef56988a3d6a784f6f9827'
* commit 'b864230c49089b087eef56988a3d6a784f6f9827':
  rtmp: Move RTMP digest calculation to a separate file

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 13:32:13 -03:00
James Almer
0814f4f720 Merge commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7'
* commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7':
  build: Add missing object dependency for extract_extradata bitstream filter

This commit is a noop, see f8e29a3716

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 13:27:04 -03:00
James Almer
a86e115213 Merge commit '7995ebfad12002033c73feed422a1cfc62081e8f'
* commit '7995ebfad12002033c73feed422a1cfc62081e8f':
  arm/aarch64: vp9: Fix vertical alignment

This commit is a noop, see 21c89f3a26

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 13:24:39 -03:00
James Almer
fd59207c1c Merge commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574'
* commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574':
  matroskaenc: add support for Spherical Video elements

See 58eb0f57f6. Merged for cosmetics
purposes.
Also includes changes from d32d59bc97

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 13:19:36 -03:00
James Almer
13c84b077a Merge commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5'
* commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5':
  configure: Replace -no_weak_symbols with -Werror=partial-availability

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 12:50:49 -03:00
James Almer
b7c16a3f2c Merge commit '681a86aba6cb09b98ad716d986182060c7795d20'
* commit '681a86aba6cb09b98ad716d986182060c7795d20':
  x86: fft: Port to cpuflags

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 12:45:49 -03:00
James Almer
11f5ffd330 Merge commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb'
* commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb':
  x86: h264: Simplify DEQUANT macro with cpuflags

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 12:39:41 -03:00
James Almer
53eea3a569 Merge commit '307eb1a8ee363db1fcf869e427a8deb6d9538881'
* commit '307eb1a8ee363db1fcf869e427a8deb6d9538881':
  x86: vp8dsp: port FILTER_BILINEAR macro to cpuflags

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 12:28:39 -03:00
James Almer
2904db9045 Merge commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2'
* commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2':
  x86util: Port all macros to cpuflags

See d5f8a642f6

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 12:15:57 -03:00
James Almer
ede5ddb586 Merge commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a'
* commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a':
  h264_cavlc: check the value of run_before

[10:00:09] <jamrial> michaelni: what do you think of libav commit
522d850e68?
[10:00:45] <jamrial> it applies, but i can't reproduce the invalid
reads with the sample from the ticket mentioned in it
[10:52:57] <michaelni> jamrial, if theres an issue it should be fixed
by enlarging the scantable (as its faster) or maybe you can even drop
the if/else and use vlcs that are never returning a out of range
value. Id say the FFMIN is wrong in all cases, it should be a error
return if a check is added not silently continuing
[11:22:11] <michaelni> jamrial, i think the mb_padding stuff we have
makes it unneeded but we can possibly improve it beyond what we have

This commit is a noop

Merged-by: James Almer <jamrial@gmail.com>
2017-10-21 11:52:36 -03:00
Dale Curtis
a5fd8aa45b avformat/mov: Set start_pad correctly in mov_fix_index()
Sets the correct start padding value when an edit list is present.

A new fate test is added, fate-mov-440hz-10ms, to ensure this is
handled correctly.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Sasi Inguva <isasi-at-google.com@ffmpeg.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-21 03:12:43 +02:00
Michael Bradshaw
279dc40716 lavc: drop support for OpenJPEG 1.3-2.0
We now require 2.1+ with pkg-config.

Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
2017-10-20 17:35:28 -07:00
James Almer
07cf202614 Merge commit '83b2b34d06e74cc8775ba3d833f9782505e17539'
* commit '83b2b34d06e74cc8775ba3d833f9782505e17539':
  h2645_parse: use the bytestream2 API for packet splitting

Merged-by: James Almer <jamrial@gmail.com>
2017-10-20 19:04:53 -03:00
James Almer
f898df60bc Merge commit 'b76f6a76c6312dc551d7c37c6ded36bea7973c74'
* commit 'b76f6a76c6312dc551d7c37c6ded36bea7973c74':
  h264dec: initialize field_started to 0 on each decode call

This commit is a noop

Merged-by: James Almer <jamrial@gmail.com>
2017-10-20 19:02:09 -03:00
Daniel Kucera
858db4b01f libavformat: not treat 0 as EOF
transfer_func variable passed to retry_transfer_wrapper
are h->prot->url_read and h->prot->url_write functions.
These need to return EOF or other error properly.
In case of returning >= 0, url_read/url_write is retried
until error is returned.

Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com>
2017-10-19 22:07:21 +02:00
Marton Balint
f4090940bd ffmpeg: always init output stream before reaping filters
Otherwise the frame size of the codec is not set in the buffersink.

Fixes ticket #6603 and the following simpler case:

ffmpeg -c aac -filter_complex "sine=d=0.1,asetnsamples=1025" out.aac

Signed-off-by: Marton Balint <cus@passwd.hu>
2017-10-18 21:52:47 +02:00
Dave Rice
89cc48551b avdevice/decklink_dec: 32 bit audio support
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-10-18 21:45:24 +02:00
Mark Thompson
c37de51920 vorbis: Reorder conditions to avoid possible overread
This can trigger a single-byte overread if the codebook has the maximum
number of entries.

Fixes #6743.
2017-10-18 20:06:01 +01:00
Mark Thompson
242d8c8763 opusenc: Fix double-declaration of variable 2017-10-18 20:05:52 +01:00
Mark Thompson
32a618a948 vaapi_h264: Do not use deprecated header type
SEI headers should be inserted as generic raw data (the old specific
type has been deprecated in libva2).
2017-10-18 20:05:11 +01:00
Mark Thompson
03b1470088 vaapi_h264: Add missing return value check
Fixes CID 1419829.
2017-10-18 20:05:11 +01:00
Mark Thompson
41272e112b cbs_h264: Fix memory leak in error case
Fixes CID 1419834.
2017-10-18 20:05:11 +01:00