]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 10 Dec 2016 00:54:13 +0000 (01:54 +0100)]
swresample/resample_template: Reorder operations to avoid one addition
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 10 Dec 2016 00:52:56 +0000 (01:52 +0100)]
swresample/swresample: Check count before memcpy()
Fixes undefined operation
Fixes part of 668007-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 9 Dec 2016 16:01:14 +0000 (17:01 +0100)]
avcodec/mpeg4videodec: Fix undefined shifts in mpeg4_decode_sprite_trajectory()
Fixes: part of 670190.ogg
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 9 Dec 2016 16:01:14 +0000 (17:01 +0100)]
avformat/oggdec: Skip streams in duration correction that did not had their duration set.
Fixes: part of 670190.ogg
Fixes integer overflow
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Wed, 7 Dec 2016 17:57:41 +0000 (17:57 +0000)]
h264_slice: Wait for refs to be available before we use them in error concealment
This could happen when there was a frame number gap and frame threading was used.
This fixes #5458.
Debugging-by: Ronald S. Bultje <rsbultje@gmail.com>
Debugging-by: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
James Almer [Thu, 8 Dec 2016 18:05:20 +0000 (15:05 -0300)]
fate: add a monoscopic spherical matroska test
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 8 Dec 2016 18:04:30 +0000 (15:04 -0300)]
fate: improve fate-mov dependencies
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 8 Dec 2016 22:51:45 +0000 (23:51 +0100)]
avcodec/ffv1enc: Allocate smaller packet if the worst case size cannot be allocated
We are checking during encoding if there is enough space as version 4 needs that
check.
Fixes Ticket6005
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 8 Dec 2016 23:19:19 +0000 (00:19 +0100)]
avcodec/ffv1enc: Fix size of first slice
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Alex Converse [Thu, 8 Dec 2016 19:49:43 +0000 (11:49 -0800)]
aacdec: Rename elem_type_prev to che_prev_type.
It describes the type of the previous che element (SCE, CPE, CCE, or
LFE) and does not reflect non-che elements.
Alex Converse [Wed, 7 Dec 2016 00:47:46 +0000 (16:47 -0800)]
aacdec: Allow SBR after DRC.
Fixes https://www2.iis.fraunhofer.de/AAC/7.1auditionOutLeader_v2_rtb.mp4
Reported-by: rcombs on IRC
Lou Logan [Thu, 8 Dec 2016 21:06:05 +0000 (12:06 -0900)]
doc/muxers: remove "-strict experimental" from tee muxer examples
Examples use the native FFmpeg AAC encoder but it is no longer
considered experimental and therefore not required.
Signed-off-by: Lou Logan <lou@lrcd.com>
Paul B Mahol [Thu, 8 Dec 2016 20:21:15 +0000 (21:21 +0100)]
avfilter/vf_deband: fix silly mistakes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 18 Nov 2016 16:00:30 +0000 (17:00 +0100)]
avformat: Add max_streams option
This allows user apps to stop OOM due to excessive number of streams
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Storsjö [Wed, 9 Nov 2016 09:54:25 +0000 (11:54 +0200)]
aarch64: h264idct: Use the offset parameter to movrel
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit
6a62795d4051f435a9a2c59395d96913693922f8 )
Cherry pick Suggested-by: Martin Storsjö
This should fix the build failure on macosx
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Srinath K R [Sat, 3 Dec 2016 11:38:40 +0000 (17:08 +0530)]
avfilter/vf_hwupload_cuda: Add min/max limits for the 'device' option
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
James Almer [Thu, 8 Dec 2016 04:23:24 +0000 (01:23 -0300)]
avformat/matroskadec: remove unused variable
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 8 Dec 2016 04:21:11 +0000 (01:21 -0300)]
avformat/matroskadec: fix memleak on stream side data failure
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 8 Dec 2016 00:46:26 +0000 (01:46 +0100)]
avcodec/golomb: Consume invalid data in get_ur_golomb_jpegls()
Fixes slow loops on fuzzed data
Fixes: 245/fuzz-3-ffmpeg_AUDIO_AV_CODEC_ID_FLAC_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Tue, 6 Dec 2016 17:48:45 +0000 (14:48 -0300)]
avformat/matroskadec: add support for Spherical Video elements
Signed-off-by: James Almer <jamrial@gmail.com>
Andreas Cadhalpun [Mon, 5 Dec 2016 21:56:36 +0000 (22:56 +0100)]
yuv4mpegdec: fix leaking pkt in yuv4_read_packet
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
James Darnley [Wed, 7 Dec 2016 20:57:15 +0000 (21:57 +0100)]
avcodec/h264: resolve assert being triggered when stack is not aligned
32-bit msvc.
Vittorio Giovara [Wed, 30 Nov 2016 23:32:57 +0000 (18:32 -0500)]
fate: Add a monoscopic spherical mov test
Vittorio Giovara [Fri, 11 Nov 2016 22:47:44 +0000 (17:47 -0500)]
mov: Export spherical information
This implements Spherical Video V1 and V2, as described in the
spatial-media collection by Google.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Fri, 11 Nov 2016 22:37:43 +0000 (17:37 -0500)]
lavc: Add spherical packet side data API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Fri, 11 Nov 2016 22:25:43 +0000 (17:25 -0500)]
lavu: Add AVSphericalMapping type and frame side data
While no decoder currently exports spherical information, this type
represents a frame property that has to be passed through from container
to frames.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Wed, 7 Dec 2016 11:06:16 +0000 (12:06 +0100)]
avcodec/wavpack: Treat the first block coding too many channels as an error
Fixes memleak
Fixes: 236/8aeebc9ca49b91bf71c114dcefac56c154a3a563
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Steven Liu [Tue, 6 Dec 2016 23:43:36 +0000 (07:43 +0800)]
avformat/hlsenc: save the EXT-X-DISCONTINUITY from old list
when use fix ticket 2nd problem.
command line test step:
rm -rf output*;./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v copy
-f hls -hls_time 4 -hls_list_size 5 -hls_flags +delete_segments
-hls_flags +append_list -hls_flags +omit_endlist -hls_flags
+discont_start -t 50 output.m3u8
./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v libx264 -g 4 -f hls
-hls_time 4 -hls_list_size 5 -hls_flags +delete_segments -hls_flags
+append_list -hls_flags +omit_endlist -hls_flags +discont_start -t 5
output.m3u8
./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v libx264 -g 4 -f hls
-hls_time 4 -hls_list_size 5 -hls_flags +delete_segments -hls_flags
+append_list -hls_flags +omit_endlist -hls_flags +discont_start -t 5
output.m3u8
result:
#EXTM3U
#EXT-X-VERSION:3
#EXT-X-TARGETDURATION:5
#EXT-X-MEDIA-SEQUENCE:6
#EXTINF:4.120000,
output6.ts
#EXT-X-DISCONTINUITY
#EXTINF:4.000000,
output7.ts
#EXTINF:0.960000,
output8.ts
#EXT-X-DISCONTINUITY
#EXTINF:4.000000,
output9.ts
#EXTINF:0.960000,
output10.ts
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
James Darnley [Thu, 1 Dec 2016 02:15:10 +0000 (03:15 +0100)]
avcodec/h264: mmx2, sse2, avx 10-bit 4:2:2 h chroma deblock/loop filter
Yorkfield:
- mmx2: 2.53x (504 vs. 199 cycles)
- sse2: 3.83x (504 vs. 131 cycles)
Nehalem:
- mmx2: 2.42x (365 vs. 151 cycles)
- sse2: 3.56x (365 vs. 103 cycles)
Skylake:
- mmx2: 1.81x (308 vs. 170 cycles)
- sse2: 2.84x (308 vs. 108 cycles)
- avx: 2.93x (308 vs. 105 cycles)
James Darnley [Wed, 30 Nov 2016 20:17:16 +0000 (21:17 +0100)]
avcodec/h264: mmx2, sse2, avx 10-bit h chroma deblock/loop filter
Yorkfield:
- mmx2: 2.45x (279 vs. 114 cycles)
- sse2: 3.36x (279 vs. 83 cycles)
Nehalem:
- mmx2: 2.10x (192 vs. 92 cycles)
- sse2: 2.84x (192 vs. 68 cycles)
Skylake:
- mmx2: 1.75x (170 vs. 97 cycles)
- sse2: 2.47x (170 vs. 69 cycles)
- avx: 2.47x (170 vs. 69 cycles)
James Darnley [Thu, 1 Dec 2016 01:47:24 +0000 (02:47 +0100)]
whitespace changes after last commit
James Darnley [Thu, 1 Dec 2016 01:44:18 +0000 (02:44 +0100)]
avcodec/h264: clean up and expand x86 function definitions
Timothy Gu [Mon, 5 Dec 2016 18:20:26 +0000 (10:20 -0800)]
qsvdec: Fix memory leak
Fixes CID1396851.
Timothy Gu [Mon, 5 Dec 2016 17:24:47 +0000 (09:24 -0800)]
omx: Fix OOM check
Also use av_mallocz_array().
Fixes CID1396839.
Georgi D. Sotirov [Tue, 6 Dec 2016 20:07:59 +0000 (21:07 +0100)]
lavf/chromaprint: Update for version 1.4
Fixes ticket #5997.
Thomas Turner [Tue, 6 Dec 2016 06:22:41 +0000 (22:22 -0800)]
Added test for libavcodec/avpacket.c
Signed-off-by: Thomas Turner <thomastdt@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 6 Dec 2016 13:07:42 +0000 (14:07 +0100)]
tests/api/api-seek-test: check all compute_crc_of_packets() calls
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 6 Dec 2016 13:16:02 +0000 (14:16 +0100)]
tests/api/api-seek-test: Silence compiler warnings about uninitialized variables
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 6 Dec 2016 13:08:39 +0000 (14:08 +0100)]
tests/api/api-seek-test: Fix use of uinitialized value
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 5 Dec 2016 23:03:16 +0000 (20:03 -0300)]
avformat/dump: remove line break on mastering display metadata info dump
Signed-off-by: James Almer <jamrial@gmail.com>
Mathieu Velten [Mon, 5 Dec 2016 20:32:59 +0000 (21:32 +0100)]
avcodec/vaapi-vp9: add support for profile 2 (bpp > 8)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
Mathieu Velten [Mon, 5 Dec 2016 20:32:58 +0000 (21:32 +0100)]
avcodec/vp9: move bpp to the shared context for use in hwaccel
Signed-off-by: Mark Thompson <sw@jkqxz.net>
Andreas Cadhalpun [Mon, 5 Dec 2016 20:41:06 +0000 (21:41 +0100)]
truemotion1: fix leaking frame on init failure
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Ronald S. Bultje [Mon, 5 Dec 2016 15:18:10 +0000 (10:18 -0500)]
http: move chunk handling from http_read_stream() to http_buf_read().
Ronald S. Bultje [Mon, 5 Dec 2016 13:02:33 +0000 (08:02 -0500)]
http: make length/offset-related variables unsigned.
Fixes #5992, reported and found by Paul Cher <paulcher@icloud.com>.
Mark Thompson [Sun, 2 Oct 2016 07:48:34 +0000 (08:48 +0100)]
vaapi_encode: Write sequence header as extradata
Only works if packed headers are supported, where we can know the
output before generating the first frame.
(cherry picked from commit
0cf86fabfa5820596cca2cfead63c6f8df76c3f2 )
Jun Zhao [Mon, 5 Dec 2016 07:17:13 +0000 (15:17 +0800)]
lavf: fix the wrong warning msg and comments about av_find_stream_info
av_find_stream_info() was deprecated by avformat_find_stream_info(),
correct the warning message in the avformat_find_stream_info() and
comments in the avformat.h
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 5 Dec 2016 16:27:45 +0000 (17:27 +0100)]
ffserver: Check chunk size
Fixes out of array access
Fixes: poc_ffserver.py
Found-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 5 Dec 2016 11:54:21 +0000 (12:54 +0100)]
Avoid using the term "file" and prefer "url" in some docs and comments
This should make it less ambigous that these are URLs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 5 Dec 2016 10:14:51 +0000 (11:14 +0100)]
avformat/rtmppkt: Check for packet size mismatches
Fixes out of array access
Found-by: Paul Cher <paulcher@icloud.com>
Reviewed-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Timothy Gu [Mon, 5 Dec 2016 18:04:57 +0000 (10:04 -0800)]
zmqsend: Initialize ret to 0
Fixes CID1396857.
James Almer [Mon, 5 Dec 2016 16:07:10 +0000 (13:07 -0300)]
configure: check for strtoull on msvc
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Steven Liu [Mon, 5 Dec 2016 09:55:33 +0000 (17:55 +0800)]
avformat/hlsenc: fix ticket id 5988 for DISCONTINUITY
add EXT-X-DISCONTINUITY tag at the position of the append point.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Michael Niedermayer [Sat, 3 Dec 2016 23:11:17 +0000 (00:11 +0100)]
avcodec/flacdec: Fix undefined shift in decode_subframe()
Fixes undefined behavior
Fixes: 639961-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 22:44:56 +0000 (23:44 +0100)]
avcodec/get_bits: Fix get_sbits_long(0)
Fixes undefined behavior
Fixes: 640889-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 22:39:11 +0000 (23:39 +0100)]
avcodec/flac: forward errors from ff_flac_parse_streaminfo()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 22:37:27 +0000 (23:37 +0100)]
avcodec/flac: Check bps in ff_flac_parse_streaminfo()
Michael Niedermayer [Sat, 3 Dec 2016 17:33:22 +0000 (18:33 +0100)]
avformat/ffmdec: Silence "may be used uninitialized in this function" warnings
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 17:32:04 +0000 (18:32 +0100)]
avformat/ffmdec: cleanup on extradata memory allocation failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 17:29:35 +0000 (18:29 +0100)]
avformat/ffmdec: Forward error code from ffm_read_header()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Fri, 2 Dec 2016 20:05:49 +0000 (03:05 +0700)]
swresample/resample: do not rebuild filter when sample_delta is zero
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Michael Niedermayer [Sat, 3 Dec 2016 16:05:43 +0000 (17:05 +0100)]
avcodec/flacdec: Fix signed integer overflow in decode_subframe_fixed()
Fixes undefined behavior
Fixes: 640912-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 15:43:10 +0000 (16:43 +0100)]
avcodec/flacdsp_template: Fix undefined shift in flac_decorrelate_indep_c
Fixes: left shift of negative value
Fixes: 668346-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 2 Dec 2016 23:52:58 +0000 (00:52 +0100)]
avformat/ffmdec: remove last use of st->codec
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Sat, 3 Dec 2016 14:41:04 +0000 (15:41 +0100)]
lavf/asfdec_f: Remove CR/LF from avpriv_request_sample() call.
Carl Eugen Hoyos [Sat, 3 Dec 2016 14:40:26 +0000 (15:40 +0100)]
lavc: Remove CR/LF from avpriv_request_sample() calls.
Michael Niedermayer [Fri, 2 Dec 2016 23:52:57 +0000 (00:52 +0100)]
ffserver: remove one avcodec_context_copy()
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 2 Dec 2016 23:52:56 +0000 (00:52 +0100)]
avformat/ffmdec: Drop flags2, debug and codec->time_base setting
It should still be possible to set these through recommended_encoder_configuration
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 12:39:56 +0000 (13:39 +0100)]
avformat/ffmdec: Check media type for chunks
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 2 Dec 2016 23:52:55 +0000 (00:52 +0100)]
avformat/ffmdec: replace most codec uses by codecpar
This is a bit messy as codecar does not support AVOptions so we need
to use AVCodecContext where AVOptions are required and copy back and forth.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 2 Dec 2016 23:52:54 +0000 (00:52 +0100)]
avformat/ffmdec: Remove some st->codec uses which set encoder parameters
Modern ffserver should not need these
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Sat, 3 Dec 2016 11:53:50 +0000 (12:53 +0100)]
configure: Fix standalone compilation of the rtp muxer.
Reported and suggested by: me at juneoh dot net
Fixes ticket #5989.
Michael Niedermayer [Sat, 3 Dec 2016 02:40:55 +0000 (03:40 +0100)]
avformat/oggparsespeex: Check frames_per_packet and packet_size
The speex specification does not seem to restrict these values, thus
the limits where choosen so as to avoid multiplicative overflow
Fixes undefined behavior
Fixes: 635422.ogg
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 3 Dec 2016 02:02:41 +0000 (03:02 +0100)]
avformat/utils: Check start/end before computing duration in update_stream_timings()
Fixes undefined behavior
Fixes: 637428.ogg
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Fri, 2 Dec 2016 23:08:49 +0000 (20:08 -0300)]
compat/atomics: rename header guards
Fixes fate-source.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 2 Dec 2016 22:56:24 +0000 (19:56 -0300)]
fate: rename fate-mov-init-nonkeyframe ref file
Fixes the test. Regression since
059a786c20201fe4040738c99b02cca0cfc18a74
Signed-off-by: James Almer <jamrial@gmail.com>
Vittorio Giovara [Wed, 2 Nov 2016 15:47:34 +0000 (11:47 -0400)]
hevc: Support extradata changes
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Tue, 8 Nov 2016 21:52:29 +0000 (16:52 -0500)]
hevc: Allow parsing external extradata buffers
Vittorio Giovara [Wed, 30 Nov 2016 23:38:51 +0000 (18:38 -0500)]
fate/mov: Rename a couple of entries to respect the file naming scheme
Anton Khirnov [Mon, 28 Nov 2016 23:29:56 +0000 (15:29 -0800)]
Add a compat dummy stdatomic.h used when threading is disabled
Adapted from the code by Rémi Denis-Courmont from VLC
This merges libav commit
eb34d40354e2474517c9b9bd787e0dadc89c2a81 .
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Mon, 28 Nov 2016 23:29:55 +0000 (15:29 -0800)]
Add a compat stdatomic.h implementation based on pthreads
Adapted from the code by Rémi Denis-Courmont from VLC
This merges libav commit
f9a6a80e065cdb95b233978f1d96ec9bc863daa1 .
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Mon, 28 Nov 2016 23:29:54 +0000 (15:29 -0800)]
Add a compat stdatomic.h implementation based on suncc atomics
Adapted from the code by Rémi Denis-Courmont from VLC
This merges libav commit
bb81ed476569b912a37ed553e756e123b6b13b14 .
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Mon, 28 Nov 2016 23:29:53 +0000 (15:29 -0800)]
Add a compat stdatomic.h implementation based on windows atomics
Adapted from the code by Rémi Denis-Courmont from VLC
This merges libav commit
c2755864afadfbaa349e8d583665c86fe99fa90b .
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Mon, 28 Nov 2016 21:24:22 +0000 (13:24 -0800)]
Add a compat stdatomic.h implementation based on GCC atomics
Adapted from the code by Rémi Denis-Courmont from VLC
This merges libav commit
4e928ef340ac20325f529d92fcbc51e768085358 .
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 1 Dec 2016 16:18:15 +0000 (17:18 +0100)]
avformat/ffmenc: Remove the last use of st->codec
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 1 Dec 2016 15:17:41 +0000 (16:17 +0100)]
avformat/ffmenc: Make ffm_write_header_codec_ctx() use codecpar
This would be simpler if codecpar supported AVOptions
modern ffserver should be unaffected by this, older ffserver which required the
muxer to directly access the encoder could have issues with this, but this
direct access is just wrong and unsafe
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 1 Dec 2016 15:58:37 +0000 (16:58 +0100)]
avformat/ffmenc: set bitexact mode for old API without accessing the encoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 1 Dec 2016 15:07:35 +0000 (16:07 +0100)]
avformat/ffmenc: Drop ffm_write_header_codec_private_ctx()
This accesses the private encoder context, it should not be used by
the current ffserver it may affect old ffserver versions but i believe
there is consens that accessing the private encoder context from the muxer
is completely wrong.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 1 Dec 2016 15:00:44 +0000 (16:00 +0100)]
avformat/ffmenc: Replace some st->codec use by codecpar
Note, this temporarly drops the ability to set ffmpeg encoder debug and flags2 via ffserver.conf
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 2 Dec 2016 12:01:20 +0000 (13:01 +0100)]
avfilter/vf_premultiply: remove redundant semicolons
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rainer Hochecker [Sat, 26 Nov 2016 07:27:44 +0000 (08:27 +0100)]
matroskadec: partly revert "demux relevant subtitle packets after a seek"
This reverts parts of
c16582579b1c6f66a86615c5808cd5b2bf17be73 . The hard
coded 30 seconds are a lot, and finishing the seek can takes several
seconds when the source is on a network share. Remove this code
entirely, because it does more bad than good.
(Commit message provided by committer, based on the original messages
by the patch author.)
Signed-off-by: Rainer Hochecker <fernetmenta@online.de>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
Michael Niedermayer [Thu, 1 Dec 2016 16:37:34 +0000 (17:37 +0100)]
tests/ffserver.regression.ref: Update ffserver checksums
They have changed due to
122190392b297b7cd9783641d880df887fd80d07
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Gregory J. Wolfe [Thu, 1 Dec 2016 18:35:02 +0000 (13:35 -0500)]
avformat/tests/fifo_muxer: includes libavformat/network.h to define ETIMEDOUT for fate build.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Mon, 28 Nov 2016 16:28:59 +0000 (17:28 +0100)]
avfilter: add premultiply filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 30 Nov 2016 21:45:08 +0000 (22:45 +0100)]
swscale: add gbr(a)p16 output support
Michael Niedermayer [Thu, 1 Dec 2016 17:01:12 +0000 (18:01 +0100)]
ffserver: set format bitexact flag, eliminate warnings about it not being set
Tested-by: Reto Kromer <lists@reto.ch>
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Александр Слободенюк [Wed, 30 Nov 2016 10:31:58 +0000 (13:31 +0300)]
doc/examples/transcode_aac: fix a typo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Tobias Rapp [Thu, 24 Nov 2016 14:45:00 +0000 (15:45 +0100)]
ffmpeg: assert return value is initialized
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Tue, 29 Nov 2016 20:49:22 +0000 (21:49 +0100)]
lavfi: Fix aix compilation.
Rename hz in af_apulsator.c and avf_showspectrum.c as hertz.
The aix header sys/m_param.h defines hz as __hz.
Philip Langdale [Thu, 1 Dec 2016 00:13:14 +0000 (16:13 -0800)]
avcodec/vdpau_hevc: Fix potential out-of-bounds write
The maximum number of references is 16, so the index value cannot
exceed 15.
Fixes Coverity CID
1348139 ,
1348140 ,
1348141