OSDN Git Service
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
Philip Langdale [Thu, 1 Dec 2016 00:03:44 +0000 (16:03 -0800)]
avcodec/crystalhd: Handle errors from av_image_get_linesize
This function can return an error in certain situations.
Fixes Coverity CID 703707.
Reynaldo H. Verdejo Pinochet [Wed, 30 Nov 2016 18:28:16 +0000 (10:28 -0800)]
ffserver: fix broken HTML on generated status page
Dropped incompatible/obsoleted HTML tag attributes
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Philip Langdale [Wed, 30 Nov 2016 22:50:36 +0000 (14:50 -0800)]
tools/coverity: Add model for av_realloc
Really should have done this last time. It should provide consistency
across our allocations and frees.
James Darnley [Mon, 28 Nov 2016 23:38:43 +0000 (00:38 +0100)]
avcodec/h264: sse2 and avx 4:2:2 idct add8 10-bit functions
Yorkfield:
- sse2:
- complex: 4.13x faster (1514 vs. 367 cycles)
- simple: 4.38x faster (1836 vs. 419 cycles)
Skylake:
- sse2:
- complex: 3.61x faster ( 936 vs. 260 cycles)
- simple: 3.97x faster (1126 vs. 284 cycles)
- avx (versus sse2):
- complex: 1.07x faster (260 vs. 244 cycles)
- simple: 1.03x faster (284 vs. 274 cycles)
James Darnley [Mon, 28 Nov 2016 17:22:17 +0000 (18:22 +0100)]
avcodec/h264: mmx 4:2:2 idct add8 function
2.87 times faster (1830 vs. 638 cycles)
James Darnley [Mon, 28 Nov 2016 13:26:53 +0000 (14:26 +0100)]
avcodec/h264: mmxext 4:2:2 chroma intra deblock/loop filter
2.1 times faster (401 vs. 194 cycles)
Andreas Cadhalpun [Wed, 30 Nov 2016 00:49:09 +0000 (01:49 +0100)]
ffserver: use codec time_base for stream
This fixes producing swf and rm files as done by ffservertest.
Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Wed, 30 Nov 2016 00:29:40 +0000 (01:29 +0100)]
tests: drop -d option from ffserver invocation
It randomly causes failures with an error like:
"Failed to set value '-f' for option 'd': Error number -
920332800 occurred"
(The error number is different every time.)
Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Wed, 30 Nov 2016 00:23:26 +0000 (01:23 +0100)]
tests: print errors from ffserver
Not doing so makes debugging unnecessarily hard.
Reviewed-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Philip Langdale [Sun, 27 Nov 2016 19:16:18 +0000 (11:16 -0800)]
tools/coverity: Add models for av_mallocz and av_free
This should deal with some false positives, but might lead to
more of them depending on whether it realises that av_freep()
wraps av_free() or not.
Vittorio Giovara [Fri, 18 Nov 2016 19:34:43 +0000 (14:34 -0500)]
fate: Add test for mov displaymatrix
Vittorio Giovara [Fri, 18 Nov 2016 19:32:02 +0000 (14:32 -0500)]
ffprobe: Fix displaying side data list only
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Thu, 3 Nov 2016 22:52:08 +0000 (18:52 -0400)]
mov: Evaluate the movie display matrix
This matrix needs to be applied after all others have (currently only
display matrix from trak), but cannot be handled in movie box, since
streams are not allocated yet. So store it in main context, and apply
it when appropriate, that is after parsing the tkhd one.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Timo Rothenpieler [Tue, 29 Nov 2016 16:44:16 +0000 (17:44 +0100)]
avcodec/nvenc: mark intentional fall through
Timo Rothenpieler [Tue, 29 Nov 2016 16:40:18 +0000 (17:40 +0100)]
avfilter/vf_hwupload_cuda: fix potential leak
Timo Rothenpieler [Tue, 29 Nov 2016 16:37:13 +0000 (17:37 +0100)]
avutil/hwcontext_cuda: check for missing pixel format
Timo Rothenpieler [Tue, 29 Nov 2016 16:28:15 +0000 (17:28 +0100)]
avfilter/vf_scale_npp: check ff_set_common_formats return value
Miroslav Slugeň [Sun, 27 Nov 2016 00:09:05 +0000 (01:09 +0100)]
avfilter/vf_scale_npp: move aspect ratio correction after av_frame_copy_props
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Miroslav Slugeň [Sun, 27 Nov 2016 00:46:06 +0000 (01:46 +0100)]
avcodec/nvenc: always reduce DAR width and height
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Philip Langdale [Fri, 25 Nov 2016 19:11:45 +0000 (11:11 -0800)]
avcodec/nvenc: Delay identification of underlying format of cuda frames
When input surfaces are cuda frames, we will not know what the actual
underlying format (nv12, p010, etc) is at surface allocation time.
On the other hand, we will know when the input frames are actually
registered and associated with a surface.
So, let's delay format discovery until registration time, which is
actually how we handle other frame properties, such as dimensions.
By itself, this change doesn't allow for transcoding of 10bit
content from cuvid, but it reduces the problem to the hardcoding of
the sw format in ffmpeg_cuvid.c
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Michael Niedermayer [Tue, 29 Nov 2016 21:19:50 +0000 (22:19 +0100)]
ffserver: Add client requested urls to the status page
Fixes Ticket3791
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Mon, 28 Nov 2016 23:28:55 +0000 (00:28 +0100)]
avidec: fix leaking extradata
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Schenk [Fri, 25 Nov 2016 08:36:20 +0000 (09:36 +0100)]
matroskadec: prevent access of elements after freeing
Using the decode interrupt feature of ffmpeg may cause crashes by
accessing previously freed pointers in matroska_read_close.
To prevent this reset nb_elem to zero after freeing the elements,
because ffmpeg normally tests for nb_elem.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Thu, 24 Nov 2016 14:29:52 +0000 (15:29 +0100)]
avcodec/flac_parser: Update nb_headers_buffered
Fixes infinite loop
Fixes: fuzz.flac
Found-by: Frank Liberato <liberato@google.com>
Reviewed-by: Frank Liberato <liberato@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Mon, 28 Nov 2016 23:43:27 +0000 (00:43 +0100)]
idroqdec: fix leaking pkt on failure
The code calls av_new_packet a few lines above and the allocated memory
has to be freed in case of an error.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Paul B Mahol [Tue, 29 Nov 2016 23:06:53 +0000 (00:06 +0100)]
fate: update after addition of gray10 to lavc/raw
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 29 Nov 2016 17:25:58 +0000 (18:25 +0100)]
tests/ffserver-regression: Check the status page too
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 29 Nov 2016 18:05:43 +0000 (19:05 +0100)]
ffsrever: Make the status page bitexact if any stream is bitexact
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 29 Nov 2016 17:48:40 +0000 (18:48 +0100)]
ffserver_config: Setup codecpar in add_codec()
fixes segfault in the status page code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 28 Nov 2016 17:03:07 +0000 (18:03 +0100)]
tests/ffserver.regression.ref: update ffserver checksums
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 28 Nov 2016 17:02:37 +0000 (18:02 +0100)]
tests/ffserver-regression.sh: give wget a timeout and prevent retries
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 29 Nov 2016 01:58:34 +0000 (02:58 +0100)]
avformat/idroqdec: Check chunk_size for being too large
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Tue, 29 Nov 2016 15:50:38 +0000 (16:50 +0100)]
avfilter/vf_masked*: add gray10 and gray12 support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 29 Nov 2016 15:32:33 +0000 (16:32 +0100)]
avfilter/vf_bitplanenoise: add gray10 and gray12 suppport
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 29 Nov 2016 13:49:01 +0000 (14:49 +0100)]
avfilter/vf_extractplanes: add extract support for 10bit and 12bit formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 29 Nov 2016 10:34:48 +0000 (11:34 +0100)]
avfilter/vf_waveform: add gray10 and gray12 support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 29 Nov 2016 10:18:54 +0000 (11:18 +0100)]
avcodec/raw: add gray10 support in nut
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Daniel Verkamp [Tue, 29 Nov 2016 09:54:56 +0000 (10:54 +0100)]
avcodec/msrledec: implement vertical offset in 4-bit RLE
The delta escape (2) is supposed to work the same in 4-bit RLE as in
8-bit RLE. This is documented in the MSDN Bitmap Compression page:
https://msdn.microsoft.com/en-us/library/windows/desktop/
dd183383(v=vs.85).aspx
The unchecked modification of line is safe, since the loop condition
(line >= 0) will check it before any pixel data is written.
Fixes ticket #5153 (output now matches ImageMagick for the provided sample).
Signed-off-by: Daniel Verkamp <daniel@drv.nu>
Michael Niedermayer [Mon, 28 Nov 2016 22:28:52 +0000 (23:28 +0100)]
tests: Fix running ffserver under qemu
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 28 Nov 2016 22:07:19 +0000 (23:07 +0100)]
tests/Makefile: Fix ffservertest dependencies
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 27 Nov 2016 18:13:56 +0000 (19:13 +0100)]
ffserver: Remove last use of AVStream size
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 27 Nov 2016 17:05:07 +0000 (18:05 +0100)]
ffserver: Remove some deprecated API use related to codec/codecpar
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 27 Nov 2016 16:42:50 +0000 (17:42 +0100)]
ffserver: Remove use of AVStream as a intermediate to store parameters
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 27 Nov 2016 16:10:18 +0000 (17:10 +0100)]
ffserver: drop FeedData, its unused
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 28 Nov 2016 17:36:16 +0000 (18:36 +0100)]
tests/ffserver-regression.sh: Fix file truncation introduced in
508826f961caf662cadb7c253e3c0e7d75104bdd
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Alex Converse [Fri, 18 Nov 2016 21:56:32 +0000 (13:56 -0800)]
libvpxenc: Report encoded VP9 level
Report the actual level of the encoded output if a level is
targeted or the level is passively tracked with a target of 0.
Vittorio Giovara [Thu, 17 Nov 2016 20:51:16 +0000 (15:51 -0500)]
vf_colorspace: Forbid odd dimensions
This prevents writing past bounds.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Mon, 28 Nov 2016 15:56:12 +0000 (16:56 +0100)]
ffmpeg_opt: Fix starttime with ffm in bitexact mode
This fixes some differences between runs of the ffserver tests
(in my local tree 2 runs gave the same result with this but i had other
changes too)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Fri, 25 Nov 2016 21:09:51 +0000 (22:09 +0100)]
pngdec: check if previous frame exists instead of trusting sequence_number
This fixes a segmentation fault caused by calling memcpy with NULL as
second argument in handle_p_frame_apng.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Sun, 27 Nov 2016 19:48:28 +0000 (20:48 +0100)]
tests/ffserver.conf: Force bitexactness in the ffmpeg command
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 27 Nov 2016 20:01:06 +0000 (21:01 +0100)]
avformat/rmenc: Check framerate before storing
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Sat, 26 Nov 2016 16:01:50 +0000 (17:01 +0100)]
lavfi/f_ebur128: relicense to LGPL
All copyright holders have agreed to the relicensing.
Approved-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Approved-by: David Sedacca <sedacca@comcast.net>
Approved-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Approved-by: Jean First <jeanfirst@gmail.com>
Approved-by: Kyle Swanson <k@ylo.ph>
Approved-by: Michael Niedermayer <michael@niedermayer.cc>
Approved-by: Nicolas George <george@nsup.org>
Approved-by: Paul B Mahol <onemda@gmail.com>
Approved-by: Thilo Borgmann <thilo.borgmann@mail.de>
Michael Niedermayer [Sun, 27 Nov 2016 13:34:57 +0000 (14:34 +0100)]
avcodec/me_cmp: Fix median_sad size
Fixes out of array read
Fixes: COV1396255
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 23 Nov 2016 17:40:25 +0000 (18:40 +0100)]
ffserver: Remove extract_mpeg4_header()
This should not be needed, our AVParsers should do this
I do not have a testcase though, please help testing this and please
add fate tests if you can.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 23 Nov 2016 18:26:38 +0000 (19:26 +0100)]
Revert "ffserver: use AVStream.codecpar in open_input_stream()"
Fixes null pointer dereference
Testcase is simply a ffmpeg instance sending a stream to ffserver while another ffmpeg reads from it
This reverts commit
6f0a1710d77dde0d803861506a2157a23f08c14c.
Anton Khirnov [Thu, 24 Nov 2016 05:54:53 +0000 (21:54 -0800)]
configure: check for stdatomic.h
Since this is a C11 feature, it requires -std=c11.
Not actually used for anything yet, that will be added in the following
commits.
This merges libav commit
13f5d2bf75b95a0bfdb9940a5e359a719e242bed.
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 27 Nov 2016 10:43:54 +0000 (11:43 +0100)]
avfilter/vf_zscale: export approximate gamma option and enable it by default
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 27 Nov 2016 02:39:20 +0000 (03:39 +0100)]
avformat/utils: Fix type mismatch
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Fri, 25 Nov 2016 20:56:03 +0000 (21:56 +0100)]
lavf: always forward codec_whitelist in avformat_find_stream_info
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Hendrik Leppkes [Tue, 15 Nov 2016 09:28:54 +0000 (10:28 +0100)]
dxva2_vc1: support multiple slices
Hendrik Leppkes [Tue, 15 Nov 2016 09:28:10 +0000 (10:28 +0100)]
vc1dec: support multiple slices in frame coded images with hwaccel
Based on a patch by Jun Zhao <mypopydev@gmail.com>
Steven Liu [Sat, 26 Nov 2016 03:28:22 +0000 (11:28 +0800)]
refine avformat/flvdec set bit_rate
Steven Liu [Sat, 26 Nov 2016 00:56:18 +0000 (08:56 +0800)]
avformat/flvdec: move set bit_rate from parse AMF OBJECT to
create_stream
before patch:
Stream #0:0: Video: h264 (High), yuv420p(progressive), 1280x714 [SAR 1:1 DAR 640:357], 25 fps, 25 tbr, 1k tbn, 50 tbc
after patch:
Stream #0:0: Video: h264 (High), yuv420p(progressive), 1280x714 [SAR 1:1 DAR 640:357], 2576 kb/s, 25 fps, 25 tbr, 1k tbn, 50 tbc
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Steven Liu [Sat, 26 Nov 2016 00:52:19 +0000 (08:52 +0800)]
avformat/flvenc: fix ticket 5976 and use old commit
mythtv have problem with non-seekable dont write duration and filesize
and there have problem with some other server and player with 0 value
duation and filesize.
So add a flv flags to fix the ticket and make a choose for users.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>