OSDN Git Service
Clément Bœsch [Wed, 26 Apr 2017 11:35:57 +0000 (13:35 +0200)]
Merge commit '
86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81'
* commit '
86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81':
hevc: decouple calling get_format() from exporting the SPS parameters
See
786032cad8ecabe577d9cff0356da6e9e9488a2d (which has been reverted
and replaced with Anton's version to reduce diffs between the two
projects).
Merged-by: Clément Bœsch <u@pkh.me>
James Almer [Tue, 25 Apr 2017 23:23:12 +0000 (20:23 -0300)]
avformat/concatdec: fix the h264 annexb extradata check
The start code can be either in the first three or four bytes.
Clément Bœsch [Tue, 25 Apr 2017 17:10:39 +0000 (19:10 +0200)]
Merge commit '
730c02326094bcfb1fa67f10a7e7b22f03f5a88f'
* commit '
730c02326094bcfb1fa67f10a7e7b22f03f5a88f':
binkaudio: switch to the new send/receive API
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 25 Apr 2017 17:01:59 +0000 (19:01 +0200)]
Merge commit '
fa1749dd34c55fb997c97dfc4da9383c9976ab91'
* commit '
fa1749dd34c55fb997c97dfc4da9383c9976ab91':
vp9: split superframes in the filtering stage before actual decoding
This commit is a noop.
2017-04-24 20:45:04 @ubitux BBB: btw, do you think you can get the bsf thing this week or we should skip it to give you more time and go on with the merges?
2017-04-24 20:45:20 @BBB I’m not sure I’ll finish it that soon
2017-04-24 20:45:26 @BBB I’d skip it and leave it for later
2017-04-24 20:45:35 @BBB I’ll do it, I promise, but I Can’t guarantee it’ll be done by $date
Merged-by: Clément Bœsch <u@pkh.me>
Paul B Mahol [Tue, 25 Apr 2017 16:08:26 +0000 (18:08 +0200)]
avfilter/af_biquads: allow filtering only selected channels
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Vignali [Sun, 2 Apr 2017 20:37:51 +0000 (22:37 +0200)]
fate/exr : fix pix_fmt
rgb_scanline_pxr24_half_uint32_13x9.exr doesn't have alpha
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 25 Apr 2017 01:08:27 +0000 (03:08 +0200)]
tools/target_dec_fuzzer: Remove FuzzerInterface.h dependancy
The header is not always available in the docker build environment
Suggested-by: Kostya Serebryany
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 23 Apr 2017 22:19:36 +0000 (00:19 +0200)]
fate: Add test for pkt_size of ffprobe
Suggested-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 21 Apr 2017 21:58:32 +0000 (23:58 +0200)]
Make tools/target_dec_*_fuzzer buildable with configure and make
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 24 Apr 2017 21:16:53 +0000 (23:16 +0200)]
tools/target_dec_fuzzer: Fix build with default FFmpeg build flags
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 23 Apr 2017 17:59:32 +0000 (19:59 +0200)]
avfilter: add lumakey filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Philip Langdale [Sun, 23 Apr 2017 22:31:55 +0000 (15:31 -0700)]
avcodec/crystalhd: Another attempt at using mpeg4_unpack_bframes bsf
I tried doing this before, but it resulted in weird behaviour with
certain samples. I want to say I think I've got it sorted out now,
and the new autobsf stuff makes it trivial to turn on.
The native support for packed bframes is buggy and I think buggy
in ways beyond what I already try to account for, so this should be
a net improvements.
Philip Langdale [Sun, 23 Apr 2017 21:34:03 +0000 (14:34 -0700)]
avcodec/crystalhd: Explicitly set frame pts at all times
Previously, the pts value was initialised to AV_NOPTS_VALUE and so
it was not necessary to always set it. Now, with the new-new decode
API, this is no longer true. I'm not sure why I avoided setting the
pts when the decoder value was also AV_NOPTS_VALUE - it clearly
wouldn't have changed anything previously, but here we are.
Failing to do this, means the frame pts will be some random uninitalised
value.
Vittorio Giovara [Mon, 3 Apr 2017 19:58:15 +0000 (21:58 +0200)]
decode: Initialize ret before using it
libavcodec/decode.c:608:9: warning: variable 'ret' is
used uninitialized whenever 'if' condition is false
(cherry picked from libav commit
efddf2c09aed7400c73ecf327f86a4d0452b94b5)
Philip Langdale [Sun, 23 Apr 2017 17:42:25 +0000 (10:42 -0700)]
avcodec/movtextenc: Ignore unmatched closing style tags
The existing code will segfault if a closing tag shows up when there
was never an opening tag. This isn't a well formed style, but it's also
not a reason to crash.
Fixes: https://trac.ffmpeg.org/ticket/6303
Derek Buitenhuis [Fri, 21 Apr 2017 15:40:35 +0000 (16:40 +0100)]
webm_dash_manifest_demuxer: Fix initialization range for files with cues at the front
The WebM DASH spec states:
The Initialization Segment shall not contain Clusters or Cues.
The Segment Index corresponds to the Cues.
Previously, it included the cues if they were at the front.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 20 Apr 2017 14:02:54 +0000 (15:02 +0100)]
webm_dash_manifest_demuxer: Fix UB in cue timestamp string code and make it actually work
Output was apparently not tested for correctness. Passing overlapping
memory to snprintf causes undefined behavior, and usually resulted in
only the very last timestamp being written to metadata, and not a list
at all.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Philip Langdale [Sun, 23 Apr 2017 03:03:27 +0000 (20:03 -0700)]
avcodec/crystalhd: Switch to the new generic filtering mechanism
This lets us drop all the code for handling the mp4toannexb
conversion.
Paul B Mahol [Sun, 23 Apr 2017 16:31:05 +0000 (18:31 +0200)]
avfilter/vf_maskedmerge: fix bug when copying >8bit plane(s)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 23 Apr 2017 16:19:40 +0000 (18:19 +0200)]
avfilter/vf_premultiply: add planes option
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 23 Apr 2017 16:01:00 +0000 (18:01 +0200)]
avfilter/vf_maskedclamp: fix bug when copying >8bit plane(s)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Sun, 23 Apr 2017 15:51:52 +0000 (12:51 -0300)]
avcodec/decode: also update consumed bytes on last_pkt_props->size
Paul B Mahol [Sun, 23 Apr 2017 15:36:33 +0000 (17:36 +0200)]
avfilter/vf_maskedclamp: limit overshot and undershot to UINT16_MAX
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Sun, 23 Apr 2017 12:22:22 +0000 (14:22 +0200)]
ffmpeg: do not report EOF on filters as an error.
Also print the error message in case of real error.
Paul B Mahol [Sun, 23 Apr 2017 09:53:57 +0000 (11:53 +0200)]
avcodec/dnxhd_parser: fix parsing interlaced video, simplify code
There appears to be no need to treat interlaced videos differently,
also that code is flawed, as for at least one input cur_field would
be always 0.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Muhammad Faiz [Sat, 22 Apr 2017 08:59:09 +0000 (15:59 +0700)]
tests: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 22 Apr 2017 08:58:37 +0000 (15:58 +0700)]
examples: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 22 Apr 2017 08:58:03 +0000 (15:58 +0700)]
ff*: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 22 Apr 2017 08:57:18 +0000 (15:57 +0700)]
avfilter: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 22 Apr 2017 08:56:47 +0000 (15:56 +0700)]
avdevice: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 22 Apr 2017 08:55:45 +0000 (15:55 +0700)]
avformat: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 22 Apr 2017 08:54:58 +0000 (15:54 +0700)]
avcodec: do not use AVFrame accessor
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
James Almer [Sun, 23 Apr 2017 02:07:59 +0000 (23:07 -0300)]
Merge commit '
03a80925effc2698d21dc0b00290eecf42dd9e68'
* commit '
03a80925effc2698d21dc0b00290eecf42dd9e68':
lavc: add a bitstream filter for splitting VP9 superframes
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 23 Apr 2017 02:02:02 +0000 (23:02 -0300)]
Merge commit '
8fb4210ad8785c01fccf2fc59af6a6fa2892b6b2'
* commit '
8fb4210ad8785c01fccf2fc59af6a6fa2892b6b2':
qsvdec_h2645: switch to the new generic filtering mechanism
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 23 Apr 2017 01:35:27 +0000 (22:35 -0300)]
Merge commit '
972c71e9cb63e24f57ee481e413199c7d88a8813'
* commit '
972c71e9cb63e24f57ee481e413199c7d88a8813':
lavc: add support for filtering packets before decoding
Merged-by: James Almer <jamrial@gmail.com>
Jan Sebechlebsky [Sun, 23 Apr 2017 00:56:56 +0000 (21:56 -0300)]
avcodec/bsf: Check for packet payload when setting BSF EOF flag.
Set BSF EOF flag only if pkt == NULL or both data and
side data are not present in packet.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 23 Apr 2017 00:52:06 +0000 (21:52 -0300)]
Revert "avcodec/bsf: Forbid packet without payload in av_bsf_send_packet"
This reverts commit
bfdca87ab55c7f69087d962dc47aa45c8c6436fb.
Packets with no data or side data will be valid EOF signal in an
upcoming merge.
Signed-off-by: James Almer <jamrial@gmail.com>
Philip Langdale [Sat, 22 Apr 2017 19:01:52 +0000 (12:01 -0700)]
avcodec/crystalhd: Adapt to new new decode API
The new new decode API requires the decoder to ask for the next input
packet, and it cannot just return EAGAIN if that packet cannot be
processed yet. This means we must finally confront how we get this
decoder to block when the input buffer is full and no output frames
are ready yet.
In the end, that isn't too hard to achieve - the main trick seems to
be that you have to aggressively poll the hardware - it doesn't seem
to make any forward progress if you sleep.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 22 Apr 2017 23:08:42 +0000 (20:08 -0300)]
Merge commit '
061a0c14bb5767bca72e3a7227ca400de439ba09'
* commit '
061a0c14bb5767bca72e3a7227ca400de439ba09':
decode: restructure the core decoding code
CUVID decoder adapted by wm4.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 22 Apr 2017 23:06:47 +0000 (20:06 -0300)]
Merge commit '
549d0bdca53af7a6e0c612ab4b03baecf3a5878f'
* commit '
549d0bdca53af7a6e0c612ab4b03baecf3a5878f':
decode: be more explicit about storing the last packet properties
Also copy pkt->size in extract_packet_props(), as it's needed for
AVFrame.pkt_size
Merged-by: James Almer <jamrial@gmail.com>
Aaron Levinson [Mon, 17 Apr 2017 00:13:31 +0000 (17:13 -0700)]
libavutil/thread.h: Fixed g++ build error when ASSERT_LEVEL is greater than 1
Purpose: libavutil/thread.h: Fixed g++ build error when ASSERT_LEVEL
is greater than 1. This is only relevant when thread.h is included by
C++ files. In this case, the relevant code is only defined if
HAVE_PTHREADS is defined as 1. Use configure --assert-level=2 to do
so.
Note: Issue discovered as a result of Coverity build failure. Cause
of build failure pinpointed by Hendrik Leppkes.
Comments:
-- libavutil/thread.h: Altered ASSERT_PTHREAD_NORET definition such
that it uses av_make_error_string instead of av_err2str().
av_err2str() uses a "parenthesized type followed by an initializer
list", which is apparently not valid C++. This issue started
occurring because thread.h is now included by the DeckLink C++
files. The alteration does the equivalent of what av_err2str()
does, but instead declares the character buffer as a local
variable.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 15 Apr 2017 18:30:51 +0000 (20:30 +0200)]
ffmpeg; check return code of avcodec_send_frame when flushing encoders
Fixes Coverity CID
1404841.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Sat, 22 Apr 2017 19:59:29 +0000 (21:59 +0200)]
avcodec/h264_cavlc: Fix undefined behavior on qscale overflow
Fixes: 1214/clusterfuzz-testcase-minimized-
6130606599569408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Thomas Mundt [Thu, 20 Apr 2017 21:26:59 +0000 (23:26 +0200)]
avfilter/interlace: change lowpass_line function prototype
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 20 Apr 2017 17:58:59 +0000 (19:58 +0200)]
avfilter/avf_avectorscope: Assert that format is valid
This should help coverity realize that src[] is inited
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sat, 22 Apr 2017 11:07:33 +0000 (13:07 +0200)]
avfilter: add doubleweave filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 21 Apr 2017 19:44:28 +0000 (21:44 +0200)]
avcodec/utvideodec: fix gradient prediction when stride does not match width
Fixes #6340.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 21 Apr 2017 10:27:17 +0000 (12:27 +0200)]
avcodec/utvideodec: fix decoding odd sizes with interlaced video with some formats
Fixes #6316.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Lou Logan [Thu, 20 Apr 2017 21:34:56 +0000 (13:34 -0800)]
doc/filters: deflicker size option value is in frames
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (in #ffmpeg-devel IRC)
Paul B Mahol [Tue, 18 Apr 2017 13:18:40 +0000 (15:18 +0200)]
avfilter: add deflicker filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Derek Buitenhuis [Thu, 20 Apr 2017 15:17:44 +0000 (16:17 +0100)]
avformat/webmdashenc: Validate the 'streams' adaptation sets parameter
It should not be a value larger than the number of streams we have,
or it will cause invalid reads and/or SIGSEGV.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Thu, 20 Apr 2017 12:14:42 +0000 (13:14 +0100)]
avformat/webmdashenc: Require the 'adaptation_sets' option to be set
This seems to be non-optional, and if the muxer is run without it,
strlen() is run on NULL, causing a segfault.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Tue, 11 Apr 2017 04:03:51 +0000 (01:03 -0300)]
avcodec/aac_adtstoasc: fix ASC passthrough on small frames
ASC frames smaller than AAC_ADTS_HEADER_SIZE were being discarded.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 20 Apr 2017 00:19:21 +0000 (02:19 +0200)]
avfilter/af_compand: Check av_strtok() for failure
Fixes CID1396256
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 19 Apr 2017 20:58:27 +0000 (22:58 +0200)]
tools/target_dec_fuzzer: Fuzz video decoder related fields in context.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Tue, 18 Apr 2017 08:56:31 +0000 (10:56 +0200)]
lavf/mov: Only copy extradata if it exists.
Avoids undefined call of memcpy(ptr, NULL, 0);
Carl Eugen Hoyos [Tue, 18 Apr 2017 09:02:30 +0000 (11:02 +0200)]
lavc/motion_est: Fix undefined negative left shifts.
Sasi Inguva [Mon, 26 Sep 2016 18:42:52 +0000 (11:42 -0700)]
tests/fate-run.sh: Show packet flags for fate gapless tests.
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Brett Harrison [Wed, 19 Apr 2017 01:15:39 +0000 (18:15 -0700)]
avfilter/vf_drawtext: added expr evaluation to drawtext fontsize
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 16 Apr 2017 16:44:57 +0000 (18:44 +0200)]
avcodec: add Screen Recorder Gold Codec decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 15 Apr 2017 08:57:07 +0000 (10:57 +0200)]
avcodec: add Mandsoft Screen Capture Codec decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Zern [Fri, 14 Apr 2017 01:50:51 +0000 (18:50 -0700)]
doc/encoders.texi: document libvpxenc's -row-mt
added in:
734d760e2f lavc/libvpxenc: add -row-mt option
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
Michael Niedermayer [Tue, 18 Apr 2017 00:12:05 +0000 (02:12 +0200)]
ffmpeg: Clear fifo pointer on deallocation
Not leaving stale pointers is more robust
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mickael Maison [Sun, 16 Apr 2017 15:29:48 +0000 (16:29 +0100)]
doc/fftools-common-opts: Fixed a typo in the common arguments list
- Fixed a typo for the -sources argument
Signed-off-by: Mickael Maison <mickael.maison@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Zern [Mon, 17 Apr 2017 17:59:31 +0000 (10:59 -0700)]
matroskadec,cosmetics: fix a couple typos
Signed-off-by: James Zern <jzern@google.com>
Vignesh Venkatasubramanian [Wed, 12 Apr 2017 04:33:28 +0000 (21:33 -0700)]
webm_dash_manifest: Add option to specify bandwidth
Add an option to webm_dash_manifest demuxer to specify a value for
"bandwidth" field in the DASH manifest. The value is then used by
the muxer. Fixes an existing FIXME in the code.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: James Zern <jzern@google.com>
Clément Bœsch [Mon, 17 Apr 2017 12:01:31 +0000 (14:01 +0200)]
Merge commit '
47e547b321338c73c21fa623789f1efbd80a297a'
* commit '
47e547b321338c73c21fa623789f1efbd80a297a':
lavc: add a null bitstream filter
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 11:57:08 +0000 (13:57 +0200)]
Merge commit '
0309ddcfb25fd44883bfcdb07509eb4907576b97'
* commit '
0309ddcfb25fd44883bfcdb07509eb4907576b97':
lavc: handle MP3 in get_audio_frame_duration()
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 11:55:50 +0000 (13:55 +0200)]
Merge commit '
6aa4ba7131b6e8668e33430e18101a051fe492eb'
* commit '
6aa4ba7131b6e8668e33430e18101a051fe492eb':
dxva2: Keep code shared between dxva2 and d3d11va under the correct #if
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 11:54:05 +0000 (13:54 +0200)]
Merge commit '
b0e6b3f4777910d61083976aa9fc78a1e0731aae'
* commit '
b0e6b3f4777910d61083976aa9fc78a1e0731aae':
hevc: ppc: Add HEVC 4x4 IDCT for PowerPC
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 11:45:21 +0000 (13:45 +0200)]
Merge commit '
fc368497f2fff54ddf5316224c573c9d1939fb25'
* commit '
fc368497f2fff54ddf5316224c573c9d1939fb25':
configure: Add missing dxva2 dependency for dxva2_lib
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 11:42:33 +0000 (13:42 +0200)]
Merge commit '
f1248fae90b45501af4e8743d373e79191470331'
* commit '
f1248fae90b45501af4e8743d373e79191470331':
configure: Handle dxva2 optional components in the standard way
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 10:54:46 +0000 (12:54 +0200)]
Merge commit '
a6901b9c6bd51396c1159f1a07f9f5042328cda6'
* commit '
a6901b9c6bd51396c1159f1a07f9f5042328cda6':
Drop libxvid rate control support for mpegvideo encoding
This commit is a noop, there is no known issue with it.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 08:32:45 +0000 (10:32 +0200)]
Merge commit '
ac648bb835edd3f67bda2267d0e72e5e582eb5a1'
* commit '
ac648bb835edd3f67bda2267d0e72e5e582eb5a1':
dxva2: Simplify some ifdefs
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 08:28:54 +0000 (10:28 +0200)]
Merge commit '
7d81698b89172d2dcf1b78d4b42ba86262360559'
* commit '
7d81698b89172d2dcf1b78d4b42ba86262360559':
vaapi_h265: Fix CFR mode with framerate set in AVCodecContext
This commit is a noop, see
37de9ce713ebb65d8b040f4f83ba7542f0754485
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 08:28:03 +0000 (10:28 +0200)]
Merge commit '
ade370a4d7eab1866b6023c91c135d27c77ca465'
* commit '
ade370a4d7eab1866b6023c91c135d27c77ca465':
lavfi: Add VAAPI deinterlacer
This commit is a noop, see
359586f14f46bf3f9c1ae3375d80e8c0fc377bef
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 08:27:18 +0000 (10:27 +0200)]
Merge commit '
f8a1ead0ae4402df0503c83f213f57b785a5f20f'
* commit '
f8a1ead0ae4402df0503c83f213f57b785a5f20f':
build: Add -D_XOPEN_SOURCE=600 to CPPFLAGS on Cygwin
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 08:26:42 +0000 (10:26 +0200)]
Merge commit '
39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed'
* commit '
39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed':
configure: Fix _libs vs. _extralibs oversight
This commit is a noop, see
9bf3d8408937e101921b3a0090cd6ae116b0c41f
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 08:22:52 +0000 (10:22 +0200)]
Merge commit '
be2d555c980220e65d0ca5c3d78e6cc1e24451a5'
* commit '
be2d555c980220e65d0ca5c3d78e6cc1e24451a5':
build: Use _extralibs variable names instead of _libs everywhere
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 08:00:06 +0000 (10:00 +0200)]
build: remove special freetype check
Since
52ccc4a0e was merged, it's pointless to keep our special version.
Clément Bœsch [Mon, 17 Apr 2017 07:39:31 +0000 (09:39 +0200)]
Merge commit '
0507cd5b9f3c3769645bc6e9177eaf760f490d1c'
* commit '
0507cd5b9f3c3769645bc6e9177eaf760f490d1c':
build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 17 Apr 2017 07:36:26 +0000 (09:36 +0200)]
Merge commit '
a7101eb40e69ada3872ec5aebe9c5c165745fb3a'
* commit '
a7101eb40e69ada3872ec5aebe9c5c165745fb3a':
configure: Simplify some library checks via check_lib()
This commit is a noop as it doesn't apply to FFmpeg:
- the nanosleep check doesn't use add_extralibs in FFmpeg
- the pthread checks check multiple functions before add the extra
libraries
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 15 Apr 2017 16:42:30 +0000 (18:42 +0200)]
Merge commit '
1818a640cfdccd52e97edf13564f45bc3d0d93eb'
* commit '
1818a640cfdccd52e97edf13564f45bc3d0d93eb':
build: Fix dependencies for alsa/jack/sndio support
Added explicit enable (which will be automatically added later on in
ee480790c) to actually fix this commit. Without the explicit enables,
alsa, jack and sndio gets disabled.
Also added jack, alsa and sndio to the have list so the HAVE_* are
populated to make (this fixes the SKIPHEADERS chunks).
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 15 Apr 2017 16:38:45 +0000 (18:38 +0200)]
Merge commit '
af451ac0de6776e97d6a3ff95eac257b7964002e'
* commit '
af451ac0de6776e97d6a3ff95eac257b7964002e':
configure: Drop redundant and partly bogus vaapi/vdpau header checks
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 15 Apr 2017 16:36:30 +0000 (18:36 +0200)]
Merge commit '
932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'
* commit '
932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a':
vdpau: Do not #include vdpau_x11.h from the main vdpau header
Merged-by: Clément Bœsch <u@pkh.me>
Aaron Levinson [Sat, 15 Apr 2017 06:41:46 +0000 (08:41 +0200)]
avdevice/decklink: remove pthread dependency
Purpose: avdevice/decklink: Removed pthread dependency by replacing
semaphore used in code appropriately. Doing so makes it easier to
build ffmpeg using Visual C++ on Windows. This is a contination of
Kyle Schwarz's "avdevice/decklink: Remove pthread dependency" patch
that is available at https://patchwork.ffmpeg.org/patch/2654/ . This
patch wasn't accepted, and as far as I can tell, there was no
follow-up after it was rejected.
Notes: Used Visual Studio 2015 (with update 3) for this.
Comments:
-- configure: Eliminated pthreads dependency for decklink_indev_deps
and decklink_outdev_deps and replaced with threads dependency
-- libavdevice/decklink_common.cpp / .h:
a) Eliminated semaphore and replaced with a combination of a mutex,
condition variable, and a counter (frames_buffer_available_spots).
b) Removed include of pthread.h and semaphore.h and now using
libavutil/thread.h instead.
-- libavdevice/decklink_dec.cpp: Eliminated include of pthread.h and
semaphore.h.
-- libavdevice/decklink_enc.cpp:
a) Eliminated include of pthread.h and semaphore.h.
b) Replaced use of semaphore with the equivalent using a combination
of a mutex, condition variable, and a counter
(frames_buffer_available_spots). In theory, libavutil/thread.h and
the associated code could have been modified instead to add
cross-platform implementations of the sem_ functions, but an
inspection of the ffmpeg source base indicates that there are only
two cases in which semaphores are used (including this one that was
replaced), so it was deemed to not be worth the effort.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 15 Mar 2017 02:19:41 +0000 (03:19 +0100)]
ffplay: fix indentation
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 15 Mar 2017 02:14:55 +0000 (03:14 +0100)]
ffplay: convert to new decode API
Signed-off-by: Marton Balint <cus@passwd.hu>
Paul B Mahol [Sat, 15 Apr 2017 07:22:52 +0000 (09:22 +0200)]
avcodec/dnxhdenc: fix recent regression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Fri, 14 Apr 2017 22:32:43 +0000 (00:32 +0200)]
lavc/opus_pvq: Add missing copyright notices from libopus.
The file is based on libopus, analyzed by Rostislav Pehlivanov.
Steven Liu [Fri, 14 Apr 2017 15:30:29 +0000 (23:30 +0800)]
avformat/hlsenc: add hls encrypt options
refer to:
https://git.libav.org/?p=libav.git;a=commitdiff;h=
0a4b9d0ccd10b3c39105f99bd320f696f69a75a2
add hls encrypt options looks like libav's libavformat/hlsenc.c
Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Paul B Mahol [Fri, 14 Apr 2017 14:09:07 +0000 (16:09 +0200)]
avcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 14 Apr 2017 14:00:35 +0000 (16:00 +0200)]
avcodec/dnxhdenc: make sure that mb_height > 255 can be stored
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Rostislav Pehlivanov [Wed, 12 Apr 2017 22:26:34 +0000 (23:26 +0100)]
opus_pvq: add resynth support and band encoding cost function
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
James Almer [Fri, 14 Apr 2017 00:03:41 +0000 (21:03 -0300)]
build: fix tools build dependencies
Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:57:31 +0000 (19:57 -0300)]
Merge commit '
92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'
* commit '
92e6b31c3b31be5d6fcad6bf0030bea86a1c8360':
dxva2: Adjust multiple inclusion guard names to follow convention
This commit is a noop, see
180f9a09588d1c68983692bb5245213956fdde11
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:56:17 +0000 (19:56 -0300)]
Merge commit '
dbfe60caca2e8323efa7aba6762dce7be2eba390'
* commit '
dbfe60caca2e8323efa7aba6762dce7be2eba390':
vf_hwupload_cuda: Add min/max limits for device option
This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:53:14 +0000 (19:53 -0300)]
Merge commit '
4efea4ce75fbea3e5f8be8040068bfaaffbb2718'
* commit '
4efea4ce75fbea3e5f8be8040068bfaaffbb2718':
APIChanges: Mention where release 12 was cut
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:49:20 +0000 (19:49 -0300)]
Merge commit '
3f75e5116b900f1428aa13041fc7d6301bf1988a'
* commit '
3f75e5116b900f1428aa13041fc7d6301bf1988a':
avio: Keep track of the amount of data written
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:04:26 +0000 (19:04 -0300)]
Merge commit '
fc85646ad495f3418042468da415af73a7a07334'
* commit '
fc85646ad495f3418042468da415af73a7a07334':
libopusdec: fix out-of-bounds read
libschroedingerdec: fix leaking of framewithpts
libschroedingerdec: don't produce empty frames
This commit is a noop, see
a86ebbf7f641bc797002ddea7fb517759722cd1b
3c0328d58d98664b05efdd377d3fe66a569d385e
8c8f543b81aa2b50bb6a6cfd370a0061281492a3
Merged-by: James Almer <jamrial@gmail.com>