c2f3af57a5
avcodec/nvenc: mark intentional fall through
2016-11-30 12:36:23 +01:00
7dafb3a25a
avfilter/vf_hwupload_cuda: fix potential leak
2016-11-30 12:36:23 +01:00
52773a2c68
avutil/hwcontext_cuda: check for missing pixel format
2016-11-30 12:36:23 +01:00
88281a5256
avfilter/vf_scale_npp: check ff_set_common_formats return value
2016-11-30 12:36:23 +01:00
1d056dd855
avfilter/vf_scale_npp: move aspect ratio correction after av_frame_copy_props
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-11-30 12:36:23 +01:00
f2dd6aee80
avcodec/nvenc: always reduce DAR width and height
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-11-30 12:36:23 +01:00
27038693bb
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 >
2016-11-30 12:36:23 +01:00
8cbdaa4b01
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 >
2016-11-30 11:25:17 +01:00
2c908f22c2
avidec: fix leaking extradata
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-30 02:22:50 +01:00
18b9466937
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 >
2016-11-30 01:15:38 +01:00
2475858889
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 >
2016-11-30 00:58:56 +01:00
c0175fa92b
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 >
2016-11-30 00:22:45 +01:00
94d3d98246
fate: update after addition of gray10 to lavc/raw
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-11-30 00:08:05 +01:00
bced37c155
tests/ffserver-regression: Check the status page too
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-29 19:26:26 +01:00
606702ea34
ffsrever: Make the status page bitexact if any stream is bitexact
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-29 19:26:26 +01:00
472fee91bc
ffserver_config: Setup codecpar in add_codec()
...
fixes segfault in the status page code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-29 19:26:26 +01:00
dbe1878060
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 >
2016-11-29 19:26:26 +01:00
6216127d0c
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 >
2016-11-29 19:26:26 +01:00
744a0b5206
avformat/idroqdec: Check chunk_size for being too large
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-29 19:26:26 +01:00
9e9c2276c3
avfilter/vf_masked*: add gray10 and gray12 support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-11-29 16:50:38 +01:00
c9dcd25288
avfilter/vf_bitplanenoise: add gray10 and gray12 suppport
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-11-29 16:32:33 +01:00
46752d6b12
avfilter/vf_extractplanes: add extract support for 10bit and 12bit formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-11-29 14:50:28 +01:00
57ef0f0f17
avfilter/vf_waveform: add gray10 and gray12 support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-11-29 11:34:48 +01:00
d56c7830c0
avcodec/raw: add gray10 support in nut
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-11-29 11:23:20 +01:00
e856ac2373
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 >
2016-11-29 10:57:49 +01:00
1e7f9b0ec6
tests: Fix running ffserver under qemu
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-28 23:50:01 +01:00
c3f781c52a
tests/Makefile: Fix ffservertest dependencies
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-28 23:50:01 +01:00
0dbee67700
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 >
2016-11-28 22:45:38 +01:00
da38da4595
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 >
2016-11-28 22:45:33 +01:00
75b436d8b6
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 >
2016-11-28 22:45:28 +01:00
c8b24a685a
ffserver: drop FeedData, its unused
...
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-28 22:45:05 +01:00
319a7c5dea
tests/ffserver-regression.sh: Fix file truncation introduced in 508826f961
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-28 22:41:43 +01:00
8899057d91
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.
2016-11-28 12:02:43 -08:00
afb84857bf
vf_colorspace: Forbid odd dimensions
...
This prevents writing past bounds.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-11-28 11:24:09 -05:00
bda6f2937e
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 >
2016-11-28 17:15:31 +01:00
801b5c18c7
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 >
2016-11-27 23:46:30 +01:00
55997d5043
tests/ffserver.conf: Force bitexactness in the ffmpeg command
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-27 23:28:23 +01:00
102f7d0ee6
avformat/rmenc: Check framerate before storing
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-27 23:28:23 +01:00
5d7be07a8b
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 >
2016-11-27 20:46:20 +01:00
d9883ded34
avcodec/me_cmp: Fix median_sad size
...
Fixes out of array read
Fixes: COV1396255
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-27 14:34:57 +01:00
9478bd87d4
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 >
2016-11-27 14:08:00 +01:00
bc9eb0467a
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 6f0a1710d7
2016-11-27 14:07:58 +01:00
6a4e24280d
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 13f5d2bf75wtc@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-27 13:07:07 +01:00
4719e563a4
avfilter/vf_zscale: export approximate gamma option and enable it by default
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-11-27 11:43:54 +01:00
a06e84b56e
avformat/utils: Fix type mismatch
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-27 04:08:00 +01:00
ff5f4bd976
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 >
2016-11-26 23:37:55 +01:00
99ee8ee093
dxva2_vc1: support multiple slices
2016-11-26 13:11:36 +01:00
36e27c87e7
vc1dec: support multiple slices in frame coded images with hwaccel
...
Based on a patch by Jun Zhao <mypopydev@gmail.com >
2016-11-26 13:11:32 +01:00
af7d0ad983
refine avformat/flvdec set bit_rate
2016-11-26 11:28:22 +08:00
7c5478a203
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 >
2016-11-26 08:56:18 +08:00
