summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* ffserver: Check chunk sizeMichael Niedermayer2016-12-05
| | | | | | | | Fixes out of array access Fixes: poc_ffserver.py Found-by: Paul Cher <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Avoid using the term "file" and prefer "url" in some docs and commentsMichael Niedermayer2016-12-05
| | | | | | This should make it less ambigous that these are URLs Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rtmppkt: Check for packet size mismatchesMichael Niedermayer2016-12-05
| | | | | | | | 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>
* zmqsend: Initialize ret to 0Timothy Gu2016-12-05
| | | | Fixes CID1396857.
* configure: check for strtoull on msvcJames Almer2016-12-05
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/hlsenc: fix ticket id 5988 for DISCONTINUITYSteven Liu2016-12-05
| | | | | | add EXT-X-DISCONTINUITY tag at the position of the append point. Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avcodec/flacdec: Fix undefined shift in decode_subframe()Michael Niedermayer2016-12-04
| | | | | | | | Fixes undefined behavior Fixes: 639961-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/get_bits: Fix get_sbits_long(0)Michael Niedermayer2016-12-03
| | | | | | | | Fixes undefined behavior Fixes: 640889-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/flac: forward errors from ff_flac_parse_streaminfo()Michael Niedermayer2016-12-03
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/flac: Check bps in ff_flac_parse_streaminfo()Michael Niedermayer2016-12-03
|
* avformat/ffmdec: Silence "may be used uninitialized in this function" warningsMichael Niedermayer2016-12-03
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: cleanup on extradata memory allocation failureMichael Niedermayer2016-12-03
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: Forward error code from ffm_read_header()Michael Niedermayer2016-12-03
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/resample: do not rebuild filter when sample_delta is zeroMuhammad Faiz2016-12-04
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* avcodec/flacdec: Fix signed integer overflow in decode_subframe_fixed()Michael Niedermayer2016-12-03
| | | | | | | | Fixes undefined behavior Fixes: 640912-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/flacdsp_template: Fix undefined shift in flac_decorrelate_indep_cMichael Niedermayer2016-12-03
| | | | | | | | Fixes: left shift of negative value Fixes: 668346-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: remove last use of st->codecMichael Niedermayer2016-12-03
| | | | | Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/asfdec_f: Remove CR/LF from avpriv_request_sample() call.Carl Eugen Hoyos2016-12-03
|
* lavc: Remove CR/LF from avpriv_request_sample() calls.Carl Eugen Hoyos2016-12-03
|
* ffserver: remove one avcodec_context_copy()Michael Niedermayer2016-12-03
| | | | | Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: Drop flags2, debug and codec->time_base settingMichael Niedermayer2016-12-03
| | | | | | It should still be possible to set these through recommended_encoder_configuration Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: Check media type for chunksMichael Niedermayer2016-12-03
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: replace most codec uses by codecparMichael Niedermayer2016-12-03
| | | | | | | 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>
* avformat/ffmdec: Remove some st->codec uses which set encoder parametersMichael Niedermayer2016-12-03
| | | | | | Modern ffserver should not need these Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: Fix standalone compilation of the rtp muxer.Carl Eugen Hoyos2016-12-03
| | | | | | Reported and suggested by: me at juneoh dot net Fixes ticket #5989.
* avformat/oggparsespeex: Check frames_per_packet and packet_sizeMichael Niedermayer2016-12-03
| | | | | | | | | | | 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>
* avformat/utils: Check start/end before computing duration in ↵Michael Niedermayer2016-12-03
| | | | | | | | | | update_stream_timings() Fixes undefined behavior Fixes: 637428.ogg Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* compat/atomics: rename header guardsJames Almer2016-12-02
| | | | | | Fixes fate-source. Signed-off-by: James Almer <jamrial@gmail.com>
* fate: rename fate-mov-init-nonkeyframe ref fileJames Almer2016-12-02
| | | | | | Fixes the test. Regression since 059a786c20201fe4040738c99b02cca0cfc18a74 Signed-off-by: James Almer <jamrial@gmail.com>
* hevc: Support extradata changesVittorio Giovara2016-12-02
| | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* hevc: Allow parsing external extradata buffersVittorio Giovara2016-12-02
|
* fate/mov: Rename a couple of entries to respect the file naming schemeVittorio Giovara2016-12-02
|
* Add a compat dummy stdatomic.h used when threading is disabledAnton Khirnov2016-12-02
| | | | | | | | | | 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>
* Add a compat stdatomic.h implementation based on pthreadsAnton Khirnov2016-12-02
| | | | | | | | | | 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>
* Add a compat stdatomic.h implementation based on suncc atomicsAnton Khirnov2016-12-02
| | | | | | | | | | 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>
* Add a compat stdatomic.h implementation based on windows atomicsAnton Khirnov2016-12-02
| | | | | | | | | | 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>
* Add a compat stdatomic.h implementation based on GCC atomicsAnton Khirnov2016-12-02
| | | | | | | | | | 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>
* avformat/ffmenc: Remove the last use of st->codecMichael Niedermayer2016-12-02
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmenc: Make ffm_write_header_codec_ctx() use codecparMichael Niedermayer2016-12-02
| | | | | | | | | 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>
* avformat/ffmenc: set bitexact mode for old API without accessing the encoderMichael Niedermayer2016-12-02
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmenc: Drop ffm_write_header_codec_private_ctx()Michael Niedermayer2016-12-02
| | | | | | | | | 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>
* avformat/ffmenc: Replace some st->codec use by codecparMichael Niedermayer2016-12-02
| | | | | | Note, this temporarly drops the ability to set ffmpeg encoder debug and flags2 via ffserver.conf Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_premultiply: remove redundant semicolonsMichael Niedermayer2016-12-02
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* matroskadec: partly revert "demux relevant subtitle packets after a seek"Rainer Hochecker2016-12-02
| | | | | | | | | | | | | 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>
* tests/ffserver.regression.ref: Update ffserver checksumsMichael Niedermayer2016-12-01
| | | | | | | They have changed due to 122190392b297b7cd9783641d880df887fd80d07 Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/tests/fifo_muxer: includes libavformat/network.h to define ↵Gregory J. Wolfe2016-12-01
| | | | | | ETIMEDOUT for fate build. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter: add premultiply filterPaul B Mahol2016-12-01
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swscale: add gbr(a)p16 output supportPaul B Mahol2016-12-01
|
* ffserver: set format bitexact flag, eliminate warnings about it not being setMichael Niedermayer2016-12-01
| | | | | | 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>
* doc/examples/transcode_aac: fix a typoАлександр Слободенюк2016-12-01
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>