ffmpeg.git
2 years agoMerge commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286'
James Almer [Mon, 30 Oct 2017 19:40:11 +0000 (16:40 -0300)]
Merge commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286'

* commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286':
  mlp: Rename the channel layout variable

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'bee89ed3ec61a4a0e72255ae6f4a4274d25b5ccd'
James Almer [Mon, 30 Oct 2017 19:36:06 +0000 (16:36 -0300)]
Merge commit 'bee89ed3ec61a4a0e72255ae6f4a4274d25b5ccd'

* commit 'bee89ed3ec61a4a0e72255ae6f4a4274d25b5ccd':
  matroskaenc: don't warn about unknown spherical metadata when there isn't any

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '04b0f0e371ff81b682274b574fb465ba4395c09f'
James Almer [Mon, 30 Oct 2017 19:08:14 +0000 (16:08 -0300)]
Merge commit '04b0f0e371ff81b682274b574fb465ba4395c09f'

* commit '04b0f0e371ff81b682274b574fb465ba4395c09f':
  mem: uninline av_malloc(z)_array()

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3d69dd65c6771c28d3bf4e8e53a905aa8cd01fd9'
James Almer [Mon, 30 Oct 2017 19:03:27 +0000 (16:03 -0300)]
Merge commit '3d69dd65c6771c28d3bf4e8e53a905aa8cd01fd9'

* commit '3d69dd65c6771c28d3bf4e8e53a905aa8cd01fd9':
  hevc: Add support for bitdepth 10 for IDCT DC

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '358adef0305618219522858e471edf7e0cb4043e'
James Almer [Mon, 30 Oct 2017 18:58:34 +0000 (15:58 -0300)]
Merge commit '358adef0305618219522858e471edf7e0cb4043e'

* commit '358adef0305618219522858e471edf7e0cb4043e':
  hevc: Add NEON IDCT DC functions for bitdepth 8

See 03cecf45c134ebbaecb62505fe444ade423ea7dc

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd0ce0634e09403eecaea4283cf82a2c5cea7d1e1'
James Almer [Mon, 30 Oct 2017 18:51:41 +0000 (15:51 -0300)]
Merge commit 'd0ce0634e09403eecaea4283cf82a2c5cea7d1e1'

* commit 'd0ce0634e09403eecaea4283cf82a2c5cea7d1e1':
  clearvideo: Convert to the new bitstream reader

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '189157c3fc8eeb691e3684b09d971eb5ddb47d5b'
James Almer [Mon, 30 Oct 2017 18:46:23 +0000 (15:46 -0300)]
Merge commit '189157c3fc8eeb691e3684b09d971eb5ddb47d5b'

* commit '189157c3fc8eeb691e3684b09d971eb5ddb47d5b':
  Add ClearVideo decoder

See a63496cc882428aefafc85d2f60e0908b020bffe

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a'
James Almer [Mon, 30 Oct 2017 17:58:39 +0000 (14:58 -0300)]
Merge commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a'

* commit 'c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a':
  avprobe: Handle unknown values for the color description

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/avcodec.h: remove doxy from the old bsf API functions
James Almer [Sun, 29 Oct 2017 15:42:18 +0000 (12:42 -0300)]
avcodec/avcodec.h: remove doxy from the old bsf API functions

Make it clear that these are deprecated and the new API should be
used instead.

As a side effect, this slightly reduces differences with libav.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'b812db66af160bfac2f64aef2ade4aed7eb76b12'
James Almer [Mon, 30 Oct 2017 17:31:42 +0000 (14:31 -0300)]
Merge commit 'b812db66af160bfac2f64aef2ade4aed7eb76b12'

* commit 'b812db66af160bfac2f64aef2ade4aed7eb76b12':
  utvideodec: Fix gradient prediction when stride does not match width

This commit is a noop, see 49255370044cf4a58c81a88cb8206aee62086346

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '7c25523cc8e618e77dc84d960e41e9644eaf8c33'
James Almer [Mon, 30 Oct 2017 17:20:58 +0000 (14:20 -0300)]
Merge commit '7c25523cc8e618e77dc84d960e41e9644eaf8c33'

* commit '7c25523cc8e618e77dc84d960e41e9644eaf8c33':
  utvideodec: Fix decoding odd sizes with interlaced video with some formats

See 9ef21a897c64417a0575cbc6fad6222f3163d103

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '8c0cadd17e98547d84e82111550caca4fb40ff8d'
James Almer [Mon, 30 Oct 2017 17:17:33 +0000 (14:17 -0300)]
Merge commit '8c0cadd17e98547d84e82111550caca4fb40ff8d'

* commit '8c0cadd17e98547d84e82111550caca4fb40ff8d':
  avplay: Do not try to allocate new frames when the player is closing

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '41262498ff89ef48e5ce4823b2fc2dc514a3eb0c'
James Almer [Mon, 30 Oct 2017 17:10:44 +0000 (14:10 -0300)]
Merge commit '41262498ff89ef48e5ce4823b2fc2dc514a3eb0c'

* commit '41262498ff89ef48e5ce4823b2fc2dc514a3eb0c':
  configure: Fix sem_timedwait probe

This commit is a noop. see abb5efca263daff670ebb0a07af4fc902e457ade

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '44aafa3325ec09a120bdb81b8579b8dfd65b1693'
James Almer [Mon, 30 Oct 2017 16:55:41 +0000 (13:55 -0300)]
Merge commit '44aafa3325ec09a120bdb81b8579b8dfd65b1693'

* commit '44aafa3325ec09a120bdb81b8579b8dfd65b1693':
  configure: Properly escape arguments in filter/filter_out helper functions

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3889dfde9c0284b008c5cfcbc921c1d137fb81e2'
James Almer [Mon, 30 Oct 2017 16:53:00 +0000 (13:53 -0300)]
Merge commit '3889dfde9c0284b008c5cfcbc921c1d137fb81e2'

* commit '3889dfde9c0284b008c5cfcbc921c1d137fb81e2':
  dca: Move the downmix request check outside the loop

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '2e1ab6a67dd5d9a30558d008aa6e541c68d76221'
James Almer [Mon, 30 Oct 2017 16:29:09 +0000 (13:29 -0300)]
Merge commit '2e1ab6a67dd5d9a30558d008aa6e541c68d76221'

* commit '2e1ab6a67dd5d9a30558d008aa6e541c68d76221':
  vc1dec: raise an error if sprite picture data is missing

This commit is a noop, see 30f680ee0a2707af9a649a0aa3fd951d18a25c05

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'ecc5c4db2dd3a0f328d95df89daa59f78b4b2810'
James Almer [Mon, 30 Oct 2017 16:24:51 +0000 (13:24 -0300)]
Merge commit 'ecc5c4db2dd3a0f328d95df89daa59f78b4b2810'

* commit 'ecc5c4db2dd3a0f328d95df89daa59f78b4b2810':
  doc/examples/output: Cast pointer to the right (const) type

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f25609ff06b093d82548c92fc2031cd2e66c20d3'
James Almer [Mon, 30 Oct 2017 16:20:30 +0000 (13:20 -0300)]
Merge commit 'f25609ff06b093d82548c92fc2031cd2e66c20d3'

* commit 'f25609ff06b093d82548c92fc2031cd2e66c20d3':
  doc/examples/filter_audio: const correctness

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0fd0d4fd0a518e30ff23972828ad7cf7f35cfb9d'
James Almer [Mon, 30 Oct 2017 15:33:01 +0000 (12:33 -0300)]
Merge commit '0fd0d4fd0a518e30ff23972828ad7cf7f35cfb9d'

* commit '0fd0d4fd0a518e30ff23972828ad7cf7f35cfb9d':
  swscale-test: const correctness

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavdevice/libndi_newtek_dec: remove extra bracket
James Almer [Mon, 30 Oct 2017 14:48:14 +0000 (11:48 -0300)]
avdevice/libndi_newtek_dec: remove extra bracket

Fixes compilation broken in 2245476e5c451552f8f32a4a881f6b4968898a47

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavdevice/decklink_dec: remove extra bracket
James Almer [Mon, 30 Oct 2017 14:47:03 +0000 (11:47 -0300)]
avdevice/decklink_dec: remove extra bracket

Fixes compilation broken in 2245476e5c451552f8f32a4a881f6b4968898a47

Fixes ticket #6791

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agox86/bswapdsp: add missing preprocessor wrappers for AVX2 functions
James Almer [Mon, 30 Oct 2017 01:21:46 +0000 (22:21 -0300)]
x86/bswapdsp: add missing preprocessor wrappers for AVX2 functions

Fixes build with old nasm/yasm.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agodecode: avoid leaks on failure in ff_get_buffer()
Anton Khirnov [Fri, 13 Oct 2017 16:59:16 +0000 (18:59 +0200)]
decode: avoid leaks on failure in ff_get_buffer()

If the get_buffer() call fails, the frame might have some side data
already set. Make sure it gets freed.

Merges Libav commit de77671438c24ffea93398c8dc885d4dd04477de.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolavc/avrndec: remove AV_CODEC_CAP_DR1, as it's broken
wm4 [Fri, 13 Oct 2017 16:59:15 +0000 (18:59 +0200)]
lavc/avrndec: remove AV_CODEC_CAP_DR1, as it's broken

In the is_mjpeg case, the user's get_buffer2 callback is not called,
thus completely breaking the API.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolibavformat/mov.c: use calculated dts offset when seeking in streams
Jonas Licht [Sun, 29 Oct 2017 11:11:39 +0000 (12:11 +0100)]
libavformat/mov.c: use calculated dts offset when seeking in streams

Subtract the calculated dts offset from the requested timestamp before
seeking. This fixes an error "Error while filtering: Operation not
permitted" observed with a short file which contains only one key frame
and starts with negative timestamps.

Then, av_index_search_timestamp() returns a valid negative timestamp,
but mov_seek_stream bails out with AVERROR_INVALIDDATA.

Fixes ticket #6139.

Signed-off-by: Jonas Licht <jonas.licht@fem.tu-ilmenau.de>
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agomovenc: add m4b to ipod format extensions
Lukas Stabe [Sun, 29 Oct 2017 10:35:57 +0000 (11:35 +0100)]
movenc: add m4b to ipod format extensions

m4b is commonly used as extension for m4a audiobook files.
The format is exactly the same. The only thing that differs
is the extension.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agofate: Add bitexact flag to the invalid-elst test.
Carl Eugen Hoyos [Sun, 29 Oct 2017 21:01:40 +0000 (22:01 +0100)]
fate: Add bitexact flag to the invalid-elst test.

Fixes fate-mov-invalid-elst-entry-count on a ppc system.

2 years agofate: Fix some of the fitsdec tests on big-endian.
Carl Eugen Hoyos [Sun, 29 Oct 2017 20:22:53 +0000 (21:22 +0100)]
fate: Fix some of the fitsdec tests on big-endian.

2 years agoavdevice: remove usage of deprecated setter and getter functions
James Almer [Sun, 29 Oct 2017 17:40:38 +0000 (14:40 -0300)]
avdevice: remove usage of deprecated setter and getter functions

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoffmpeg: remove usage of deprecated getter functions
James Almer [Sun, 29 Oct 2017 17:12:10 +0000 (14:12 -0300)]
ffmpeg: remove usage of deprecated getter functions

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoffprobe: remove usage of deprecated getter functions
James Almer [Sun, 29 Oct 2017 17:10:56 +0000 (14:10 -0300)]
ffprobe: remove usage of deprecated getter functions

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolavf/aviobuf: return EINVAL when reading from a write-only context.
Nicolas George [Fri, 27 Oct 2017 18:46:29 +0000 (20:46 +0200)]
lavf/aviobuf: return EINVAL when reading from a write-only context.

Signed-off-by: Nicolas George <george@nsup.org>
2 years agolavf/avio: temporarily accept 0 as EOF.
Nicolas George [Fri, 27 Oct 2017 18:46:28 +0000 (20:46 +0200)]
lavf/avio: temporarily accept 0 as EOF.

Print a warning to let applicatios fix their use.
After a deprecation period, check with a low-level assert.
Also make the constraint explicit in the doxygen comment.

Signed-off-by: Nicolas George <george@nsup.org>
2 years agoexamples/avio_reading: return AVERROR_EOF at EOF.
Nicolas George [Fri, 27 Oct 2017 18:46:27 +0000 (20:46 +0200)]
examples/avio_reading: return AVERROR_EOF at EOF.

Signed-off-by: Nicolas George <george@nsup.org>
2 years agoavcodec/jpeglsdec: Check for end of bitstream in ls_decode_line()
Michael Niedermayer [Wed, 25 Oct 2017 22:02:57 +0000 (00:02 +0200)]
avcodec/jpeglsdec: Check for end of bitstream in ls_decode_line()

Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760

Fixes: Timeout

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/jpeglsdec: Check ilv for being a supported value
Michael Niedermayer [Wed, 25 Oct 2017 22:02:56 +0000 (00:02 +0200)]
avcodec/jpeglsdec: Check ilv for being a supported value

Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: copy stream frame rate to output stream
Peter Große [Thu, 26 Oct 2017 15:58:40 +0000 (17:58 +0200)]
dashenc: copy stream frame rate to output stream

Leads to setting of DefaultDuration in Matroska muxer based on frame rate instead of timebase.
Fixes playback in Chrome.

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: Don't output frameRates at both AS and Representation-level. Only output...
Anton Schubert [Sun, 29 Oct 2017 15:10:35 +0000 (16:10 +0100)]
dashenc: Don't output frameRates at both AS and Representation-level. Only output maxFrameRate at AS-level.

Fix conformance regarding section "3.2.4. Presence of Attributes and
Element" of the "Guidelines for Implementation: DASH-IF Interoperability
Points V4.1" (http://dashif.org/guidelines/)

Signed-off-by: Anton Schubert <ischluff@mailbox.org>
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: allow AdaptationSets to have different average frame rates
Peter Große [Thu, 26 Oct 2017 16:17:31 +0000 (18:17 +0200)]
dashenc: allow AdaptationSets to have different average frame rates

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: don't write header data before the first packet arrives
Peter Große [Thu, 26 Oct 2017 15:58:37 +0000 (17:58 +0200)]
dashenc: don't write header data before the first packet arrives

Fixes: 1b8ef01f04ab ("dashenc: add webm support")
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: set DASH related options for the subsequent matroska muxer when using webm
Peter Große [Sun, 29 Oct 2017 15:10:36 +0000 (16:10 +0100)]
dashenc: set DASH related options for the subsequent matroska muxer when using webm

This patch is inspired by the ffmpeg webm_chunk muxer and fixes that all resulting
tracks have the same track number.

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: fix bitrate estimation with correct scaling
Anton Schubert [Sun, 29 Oct 2017 15:10:34 +0000 (16:10 +0100)]
dashenc: fix bitrate estimation with correct scaling

Signed-off-by: Anton Schubert <ischluff@mailbox.org>
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/rtpenc: Add support for 24 bit pcm encoding as defined by RFC 3190.
Carl Eugen Hoyos [Tue, 24 Oct 2017 21:03:02 +0000 (23:03 +0200)]
lavf/rtpenc: Add support for 24 bit pcm encoding as defined by RFC 3190.

Fixes ticket #6770.

2 years agolibavcodec/bswapdsp : add AVX2 func for bswap_buf (swap uint32_t)
Martin Vignali [Sun, 22 Oct 2017 17:06:50 +0000 (19:06 +0200)]
libavcodec/bswapdsp : add AVX2 func for bswap_buf (swap uint32_t)

2 years agolsws/yuv2rgb: Fix yuva2rgb32 on big endian hardware.
Carl Eugen Hoyos [Sat, 28 Oct 2017 23:40:18 +0000 (01:40 +0200)]
lsws/yuv2rgb: Fix yuva2rgb32 on big endian hardware.

2 years agoavformat/avformat.h: fix pairs typo
James Almer [Sun, 29 Oct 2017 13:35:40 +0000 (10:35 -0300)]
avformat/avformat.h: fix pairs typo

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat: deprecate getters and setters for AVFormatContext and AVStream fields
James Almer [Mon, 23 Oct 2017 14:39:08 +0000 (11:39 -0300)]
avformat: deprecate getters and setters for AVFormatContext and AVStream fields

The fields can be accessed directly, so these are not needed anymore.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat: move public AVStream fields up in the struct
James Almer [Mon, 23 Oct 2017 14:28:07 +0000 (11:28 -0300)]
avformat: move public AVStream fields up in the struct

Remove the silly second notice.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavutil/frame: deprecate getters and setters for AVFrame fields
James Almer [Mon, 23 Oct 2017 14:10:48 +0000 (11:10 -0300)]
avutil/frame: deprecate getters and setters for AVFrame fields

The fields can be accessed directly, so these are not needed anymore.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/magicyuvenc: improve compression
Paul B Mahol [Sun, 29 Oct 2017 11:13:54 +0000 (12:13 +0100)]
avcodec/magicyuvenc: improve compression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agolibavcodec/magicyuv : remove unneed variable assignment
Martin Vignali [Sat, 28 Oct 2017 21:17:44 +0000 (23:17 +0200)]
libavcodec/magicyuv : remove unneed variable assignment

2 years agoavformat/hlsenc: reindent hlsenc code
Steven Liu [Sun, 29 Oct 2017 04:32:24 +0000 (12:32 +0800)]
avformat/hlsenc: reindent hlsenc code

Signed-off-by: Steven Liu <lq@onvideo.cn>
2 years agoavformat/hlsenc: fix missing first segment bug in fmp4 mode
Steven Liu [Sun, 29 Oct 2017 04:31:49 +0000 (12:31 +0800)]
avformat/hlsenc: fix missing first segment bug in fmp4 mode

fix ticket id: #6776
fix code logic error, need not check first segment.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agoavformat/hlsenc: fix base_output_dirname is null when basename_size is 0 bug
Steven Liu [Sun, 29 Oct 2017 04:30:44 +0000 (12:30 +0800)]
avformat/hlsenc: fix base_output_dirname is null when basename_size is 0 bug

fix ticket id: #6777
when use argument hls_segment_filename, the basename_size will be 0

Signed-off-by: Steven Liu <lq@onvideo.cn>
2 years agoavformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flag
James Almer [Sun, 29 Oct 2017 02:47:22 +0000 (23:47 -0300)]
avformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flag

It has no effect whatsoever since the major bump.
Replace the flag's documentation to reflect this as well.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolavfi/palettegen: Fix compilation after 1da8c4e.
Carl Eugen Hoyos [Sun, 29 Oct 2017 00:35:36 +0000 (02:35 +0200)]
lavfi/palettegen: Fix compilation after 1da8c4e.

Found-by: James Almer
2 years agolavfi/palettegen: Allow setting the background colour.
Carl Eugen Hoyos [Tue, 17 Oct 2017 21:39:59 +0000 (23:39 +0200)]
lavfi/palettegen: Allow setting the background colour.

2 years agoMerge commit '8fd8f91e47f33cd82371a97ac81afc476144964f'
James Almer [Sat, 28 Oct 2017 21:30:31 +0000 (18:30 -0300)]
Merge commit '8fd8f91e47f33cd82371a97ac81afc476144964f'

* commit '8fd8f91e47f33cd82371a97ac81afc476144964f':
  qsvenc: Make sure the interlaced encoding works
  qsvenc: Use MFXVideoENCODE_Query() to update the parameters

This commit is a noop, see
dd8319767e1674d030b5d803c43029e67db5efb8
ae5b67ee64bec00c52881ff8426fddaf477341c1

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba'
James Almer [Sat, 28 Oct 2017 21:18:41 +0000 (18:18 -0300)]
Merge commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba'

* commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba':
  checkasm: hevc: Add a hevc_ prefix to the add_residual functions

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '1731c3530bffb876deb9e00dfffdf9841a8412cd'
James Almer [Sat, 28 Oct 2017 21:16:01 +0000 (18:16 -0300)]
Merge commit '1731c3530bffb876deb9e00dfffdf9841a8412cd'

* commit '1731c3530bffb876deb9e00dfffdf9841a8412cd':
  mm: Skip unexpected audio packets

This commit is a noop. The generic code already drops packets from
non-existant streams.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'
James Almer [Sat, 28 Oct 2017 21:08:41 +0000 (18:08 -0300)]
Merge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'

* commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336':
  mjpeg: Report non-3 component rgb lossless as not supported

[15:56:27] <jamrial> michaelni: can't reproduce the failure f2c469b73f is trying to "fix"
[15:56:30] <jamrial> do we support what that commit claims is unsupported?
[16:56:54] <michaelni> jamrial, yes, we support lossless rgba

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agofate: change fate-ffmpeg-attached_pics to encode to pcm_s16le
Marton Balint [Fri, 27 Oct 2017 20:14:23 +0000 (22:14 +0200)]
fate: change fate-ffmpeg-attached_pics to encode to pcm_s16le

Previously alac encoder was used, from a first glance I thought it is bitexact,
but it turns out it is using floating point arithmetic as well, so probably it
is not. Fixes fate failures on mingw32/64.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoMerge commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f'
James Almer [Sat, 28 Oct 2017 18:29:23 +0000 (15:29 -0300)]
Merge commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f'

* commit '279e3aaa14daba6b7a37d75f3fb6e29c732d123f':
  flv: Validate the packet size

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavformat/ac3dec: Check buf2 before adding 16 in ac3_eac3_probe()
Michael Niedermayer [Sat, 28 Oct 2017 14:16:46 +0000 (16:16 +0200)]
avformat/ac3dec: Check buf2 before adding 16 in ac3_eac3_probe()

This is needed since e0250cf3651e6417e0117486a7816b45fb2d34cd as that uses end-buf2
Note, there are more than 16 bytes allocated beyond "end"

Fixes: regression (segfault) with probetest

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/mov.c: Fix parsing of edit list atoms with invalid elst entry count.
Sasi Inguva [Thu, 19 Oct 2017 03:11:16 +0000 (20:11 -0700)]
lavf/mov.c: Fix parsing of edit list atoms with invalid elst entry count.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: move UTCTiming element to the end of the manifest
Peter Große [Fri, 27 Oct 2017 19:18:47 +0000 (21:18 +0200)]
dashenc: move UTCTiming element to the end of the manifest

Required by comformance XSD [1].

[1] https://github.com/Dash-Industry-Forum/Conformance-and-reference-source/blob/master/conformance/MPDValidator/schemas/DASH-MPD.xsd

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodashenc: use av_dict_set_int instead of static function
Peter Große [Thu, 26 Oct 2017 15:58:35 +0000 (17:58 +0200)]
dashenc: use av_dict_set_int instead of static function

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '4809781586d1c956005f72946a2aab5915eab350'
James Almer [Sat, 28 Oct 2017 18:08:31 +0000 (15:08 -0300)]
Merge commit '4809781586d1c956005f72946a2aab5915eab350'

* commit '4809781586d1c956005f72946a2aab5915eab350':
  travis: Exclude gcc for the macOS target

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '5352802da81f2083e65d466612e639a4e6e5530e'
James Almer [Sat, 28 Oct 2017 18:06:08 +0000 (15:06 -0300)]
Merge commit '5352802da81f2083e65d466612e639a4e6e5530e'

* commit '5352802da81f2083e65d466612e639a4e6e5530e':
  dca: Account for lfe when checking for the channel count

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '37f573543c4fd7f44339e04d8d15b95118493ddd'
James Almer [Sat, 28 Oct 2017 18:04:25 +0000 (15:04 -0300)]
Merge commit '37f573543c4fd7f44339e04d8d15b95118493ddd'

* commit '37f573543c4fd7f44339e04d8d15b95118493ddd':
  swscale: Convert the check check_image_pointers helper to a macro

[14:52:50] <jamrial> michaelni, ubitux: 37f573543c yay or nay? we don't have the warnings mentioned there because we cast the argument
[14:54:10] <@ubitux> i don't really see the improvement, no opinion
[15:04:14] <michaelni> jamrial, functions are better/cleaner than macros
[15:04:20] <michaelni> IMHO that is

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f56fa95cd13f627891a1bfb66bf61b971b9e0238'
James Almer [Sat, 28 Oct 2017 17:42:28 +0000 (14:42 -0300)]
Merge commit 'f56fa95cd13f627891a1bfb66bf61b971b9e0238'

* commit 'f56fa95cd13f627891a1bfb66bf61b971b9e0238':
  swscale: Do not shift negative values directly

14:30:21] <jamrial> michaelni: do you prefer how f56fa95cd1 (libav) handles left shift of negative value, or how we're currently doing it?
[14:30:31] <jamrial> ours is cleaner looking, IMO
[14:30:57] <@ubitux> i agree
[14:31:13] <@ubitux> if we didn't forget any, i think this commit is better noop'ed
[14:31:57] <jamrial> ubitux: we even have a bunch of other cases this commit doesn't handle that i'd have to manually change, so yeah, i'm leaning towards nooping it
[14:34:04] <michaelni> jamrial, +1, ours as its cleaner

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavfilter/zscale: fix memory leak
dxfhgwet [Sat, 28 Oct 2017 04:54:13 +0000 (21:54 -0700)]
avfilter/zscale: fix memory leak

2 years agoavfilter/zscale: fix segfault on library error
dxfhgwet [Sat, 28 Oct 2017 17:20:22 +0000 (10:20 -0700)]
avfilter/zscale: fix segfault on library error

2 years agoMerge commit '378460fef1e563704bc5a307ba748a2b819cc09d'
James Almer [Sat, 28 Oct 2017 17:04:32 +0000 (14:04 -0300)]
Merge commit '378460fef1e563704bc5a307ba748a2b819cc09d'

* commit '378460fef1e563704bc5a307ba748a2b819cc09d':
  utvideodec: Support for gradient prediction
  utvideodec: Reuse the huffyuv add_left
  utvideodec: Support ULY4 and ULH4
  utvideodec: Support UQRA and UQRG
  swscale: Add gbrap10 output
  swscale: Add input support for gbrap10 pixel format
  pixfmt: Add gbrap10 pixel format
  utvideodec: Support UQY2

This commit is a noop, see
115e63c8d6791ebdc921caf40c3def024690af2e
8100426fe4ba41b74404cbbd83184afa3239f64b
9d30690f20343ed3057fe4abf82009598d320ce5
b828788d58cb6f55e0bffa4682d75ddf84b4214b
84efdabc94251f1f6f483eb737e95d53376ae921
c62cb9bf5a50df416532afd8d5f79ebade174ac7
ea93052db3594f93f2d10be085a770184da0513d
faa94a576f5f3de10fc7016e0d94229faa1c2159

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d'
James Almer [Sat, 28 Oct 2017 17:01:25 +0000 (14:01 -0300)]
Merge commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d'

* commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d':
  avformat: Free the internal codec context at the end

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942'
James Almer [Sat, 28 Oct 2017 17:01:05 +0000 (14:01 -0300)]
Merge commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942'

* commit '19c5fa9eea47d45b5eedce3bff4edeaf83fb3942':
  golomb: Simplify get_ur_golomb_jpegls

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>
2 years agolavfi/paletteuse: fix debug_kdtree after aba926e7d
Clément Bœsch [Sat, 28 Oct 2017 16:49:30 +0000 (18:49 +0200)]
lavfi/paletteuse: fix debug_kdtree after aba926e7d

2 years agoconfigure: add missing llvidencdsp dependency to MagicYUV encoder
James Almer [Sat, 28 Oct 2017 16:14:51 +0000 (13:14 -0300)]
configure: add missing llvidencdsp dependency to MagicYUV encoder

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec: bump minor after addition of MagicYUV encoder
James Almer [Sat, 28 Oct 2017 16:14:47 +0000 (13:14 -0300)]
avcodec: bump minor after addition of MagicYUV encoder

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolavfi/paletteuse: fix debug_mean_error after aba926e7d
Clément Bœsch [Sat, 28 Oct 2017 16:01:41 +0000 (18:01 +0200)]
lavfi/paletteuse: fix debug_mean_error after aba926e7d

2 years agolavfi/paletteuse: fix debug_accuracy after aba926e7d
Clément Bœsch [Sat, 28 Oct 2017 15:59:47 +0000 (17:59 +0200)]
lavfi/paletteuse: fix debug_accuracy after aba926e7d

2 years agoavcodec: add MagicYUV encoder
Paul B Mahol [Sat, 8 Jul 2017 17:14:05 +0000 (19:14 +0200)]
avcodec: add MagicYUV encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agolavfi/paletteuse: simplify color get function prototypes
Clément Bœsch [Sat, 28 Oct 2017 15:39:48 +0000 (17:39 +0200)]
lavfi/paletteuse: simplify color get function prototypes

2 years agolavfi/paletteuse: move "new" option before debugging options
Clément Bœsch [Sat, 28 Oct 2017 15:15:06 +0000 (17:15 +0200)]
lavfi/paletteuse: move "new" option before debugging options

2 years agolavfi/paletteuse: fix to support transparency
Bjorn Roche [Mon, 23 Oct 2017 23:12:57 +0000 (19:12 -0400)]
lavfi/paletteuse: fix to support transparency

This patch enables paletteuse to identify the transparency in incoming
video and tag transparent pixels on outgoing video with the correct
index from the palette.

This requires tracking the transparency index in the palette,
establishing an alpha threshold below which a pixel is considered
transparent and above which the pixel is considered opaque, and
additional changes to track the alpha value throughout the conversion
process.

This change is a partial fix for https://trac.ffmpeg.org/ticket/4443
However, animated GIFs are still output incorrectly due to a bug
in gif optimization which does not correctly handle transparency.

Signed-off-by: Clément Bœsch <u@pkh.me>
2 years agolswr/swresample: Mention the actually supported formats when erroring out.
Carl Eugen Hoyos [Thu, 26 Oct 2017 14:52:22 +0000 (16:52 +0200)]
lswr/swresample: Mention the actually supported formats when erroring out.

Fixes ticket #6779.

2 years agoMerge commit '1fe858136b315796dd5349f3b4448a29d1bd6fa1'
James Almer [Sat, 28 Oct 2017 01:21:13 +0000 (22:21 -0300)]
Merge commit '1fe858136b315796dd5349f3b4448a29d1bd6fa1'

* commit '1fe858136b315796dd5349f3b4448a29d1bd6fa1':
  utvideodec: Prevent possible signed overflow

This commit is a noop, see e86444b19d0b63c098298243fb20fd577f34cf34

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '4d4d7cf9d539a053f531f662a972b23d335738eb'
James Almer [Sat, 28 Oct 2017 00:16:18 +0000 (21:16 -0300)]
Merge commit '4d4d7cf9d539a053f531f662a972b23d335738eb'

* commit '4d4d7cf9d539a053f531f662a972b23d335738eb':
  fmvc: Add FATE tests

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3'
James Almer [Sat, 28 Oct 2017 00:15:34 +0000 (21:15 -0300)]
Merge commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3'

* commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3':
  Add FM Screen Capture Codec decoder

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/audiotoolboxdec: fix ac3_parser header include
James Almer [Fri, 27 Oct 2017 22:41:38 +0000 (19:41 -0300)]
avcodec/audiotoolboxdec: fix ac3_parser header include

2 years agoMerge commit '89d9869d2491d4209d707a8e7f29c58227ae5a4e'
James Almer [Fri, 27 Oct 2017 21:22:39 +0000 (18:22 -0300)]
Merge commit '89d9869d2491d4209d707a8e7f29c58227ae5a4e'

* commit '89d9869d2491d4209d707a8e7f29c58227ae5a4e':
  hevc: Add NEON 16x16 IDCT

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609'
James Almer [Fri, 27 Oct 2017 16:52:19 +0000 (13:52 -0300)]
Merge commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609'

* commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609':
  ac3_parser: add a public function for parsing the data required by the demuxer

avpriv_ac3_parse_header() is left in place but without the
GetBitContext parameter, as the mov muxer requires a lot more fields
than just bitstream_id and frame_size from the AC3HeaderInfo struct.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMAINTAINERS: add my GPG fingerprint
James Almer [Fri, 27 Oct 2017 03:33:13 +0000 (00:33 -0300)]
MAINTAINERS: add my GPG fingerprint

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agofate: fix ffmpeg-attached_pics test dependencies
Marton Balint [Fri, 27 Oct 2017 00:42:25 +0000 (02:42 +0200)]
fate: fix ffmpeg-attached_pics test dependencies

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoflvdec: Check the avio_seek return value after reading a metadata packet
Martin Storsjö [Fri, 27 Oct 2017 00:27:43 +0000 (08:27 +0800)]
flvdec: Check the avio_seek return value after reading a  metadata packet

merge from libav: 585dc1aecef0371ad6f16cb3750ae2a6da9cf00a

If the metadata packet is corrupted, flv_read_metabody can accidentally
read past the start of the next packet. If the start of the  next packet
had been flushed out of the IO buffer, we would be unable to seek to
the right position (on a nonseekable stream).

Prefer to clearly error out instead of silently  trying to read from a
desynced stream which will only be interpreted as garbage.

2 years agoRevert "flvdec: Check the avio_seek return value after reading a metadata packet"
Steven Liu [Fri, 27 Oct 2017 00:26:11 +0000 (08:26 +0800)]
Revert "flvdec: Check the avio_seek return value after reading a  metadata packet"

This reverts commit ef7fe81b8554a2865d47a55edf47420878fa3d91.

2 years agofate: add fate test for ticket #6375
Marton Balint [Sun, 8 Oct 2017 13:27:50 +0000 (15:27 +0200)]
fate: add fate test for ticket #6375

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agofate: add fate test for ticket #6603
Marton Balint [Sun, 8 Oct 2017 12:51:03 +0000 (14:51 +0200)]
fate: add fate test for ticket #6603

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agolavf: Remove AVFMT_RAWPICTURE.
Carl Eugen Hoyos [Thu, 26 Oct 2017 21:43:11 +0000 (23:43 +0200)]
lavf: Remove AVFMT_RAWPICTURE.

Deprecated since October 2015.

2 years agoMerge commit '193b09189004ede4a6998e69192d1a9f63602088'
James Almer [Thu, 26 Oct 2017 20:13:14 +0000 (17:13 -0300)]
Merge commit '193b09189004ede4a6998e69192d1a9f63602088'

* commit '193b09189004ede4a6998e69192d1a9f63602088':
  thread: Define ff_mutex_* macros as stub functions when threads are disabled

Merged-by: James Almer <jamrial@gmail.com>