OSDN Git Service
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>
Aaron Levinson [Thu, 13 Apr 2017 09:38:02 +0000 (02:38 -0700)]
Support building C++ files with MSVC
Made appropriate changes to be able to successfully
build C++ files using a Visual C++ build on Windows.
Based on an earlier patch by Kyle Schwarz.
Comments:
-- compat/w32pthreads.h: Made appropriate changes to w32pthreads.h to
get it to build when it is being included in a C++ file and built
with Visual C++. This is mostly a copy of Kyle Schwarz's patch as
described above.
-- configure:
a) Now calling set_ccvars CXX to cause the various CXX_ variables to
be setup properly. For example, with MSVC (Microsoft Visual C++),
this causes CXX_O to be set to -Fo$@ instead of using the default
value. The default value does not work with Visual C++. This
change will also have the impact of correcting CXX_O (and possibly
CXX_C) for other compilers, although this is really only relevant
for the Intel compiler, in addition to MSVC.
b) Now using cl for the C++ compiler for the MSVC toolchain. This is
currently only relevant for building the
Blackmagic/Decklink-related files under avdevice.
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
James Almer [Thu, 13 Apr 2017 21:31:44 +0000 (18:31 -0300)]
Merge commit '
d3da8a0035734529c4e26696c9a0c6cb56633838'
* commit '
d3da8a0035734529c4e26696c9a0c6cb56633838':
omx: Fix allocation check
This commit is a noop, see
16a75304fe42d3a007c78126b6370c94ccf891f6
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:29:26 +0000 (18:29 -0300)]
Merge commit '
d32bdadda86b35c2960e4de877cf081b9d2dadb3'
* commit '
d32bdadda86b35c2960e4de877cf081b9d2dadb3':
qsvdec: Fix memory leak on error
This commit is a noop, see
b6f80b16d1a82463a77352b8756e1cdcaa3a33d0
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:27:20 +0000 (18:27 -0300)]
Merge commit '
6a93b596c5c3af31b843d63013a7985ffeea354d'
* commit '
6a93b596c5c3af31b843d63013a7985ffeea354d':
compat/atomics: add typecasts in atomic_compare_exchange_strong()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:25:30 +0000 (18:25 -0300)]
Merge commit '
2170017a1cd033b6f28e16476921022712a522d8'
* commit '
2170017a1cd033b6f28e16476921022712a522d8':
avutil: fix data race in av_get_cpu_flags()
This commit is a noop, see
fed50c4304eecb352e29ce789cdb96ea84d6162f
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:18:54 +0000 (18:18 -0300)]
Merge commit '
d5759701a82926059ae3e2530805e900041a5419'
* commit '
d5759701a82926059ae3e2530805e900041a5419':
libkvazaar: Add missing header #includes
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:17:09 +0000 (18:17 -0300)]
Merge commit '
892acc70105df9e6f7773bdde85b3e9541098525'
* commit '
892acc70105df9e6f7773bdde85b3e9541098525':
configure: Fail if cuda was enabled and is not available
This commit is a noop. Our CUDA implementation is autodectected.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:15:39 +0000 (18:15 -0300)]
configure: add missing golomb dependency to hevcparse
Based on a dependency addition from
fbec58daa2351cbe9fc758d8735c23ff03313db4
James Almer [Thu, 13 Apr 2017 21:14:04 +0000 (18:14 -0300)]
Merge commit '
f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'
* commit '
f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a':
build: Drop stray golomb dependencies
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:56:55 +0000 (17:56 -0300)]
Merge commit '
fbec58daa2351cbe9fc758d8735c23ff03313db4'
* commit '
fbec58daa2351cbe9fc758d8735c23ff03313db4':
build: Add an internal component for hevc_ps code
This commit is a noop, see
498e9e8e2a67e022c189f44fa33350b4f4a7979b
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:54:02 +0000 (17:54 -0300)]
Merge commit '
f912fd767e55bbb5a1554bd99bacab007659609c'
* commit '
f912fd767e55bbb5a1554bd99bacab007659609c':
Add missing #includes for standalone spherical-information-related headers
fate: Add spherical and stereo3d mov tests
avprobe: Allow specifying multiple stream entries to be shown
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:49:44 +0000 (17:49 -0300)]
Merge commit '
e90137c045721a1635cc241eb1e1be1126389c38'
* commit '
e90137c045721a1635cc241eb1e1be1126389c38':
mov: Export spherical information
lavc: Add spherical packet side data API
lavu: Add AVSphericalMapping type and frame side data
This commit is a noop, see
8f58ecc344a92e63193c38e28c173be987954bbb
e7a6f8c972a0b5b98ef7bbf393e95c434e9e2539
4dcdecf4719a9893f3825ebbad80b2af5aa23613
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:31:15 +0000 (17:31 -0300)]
Merge commit '
075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'
* commit '
075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8':
lavu: Add a video section to Doxygen documentation
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:27:43 +0000 (17:27 -0300)]
Merge commit '
624aa8ab221cf34693f9a8c5ab67219cf560f2bb'
* commit '
624aa8ab221cf34693f9a8c5ab67219cf560f2bb':
build: Add missing Makefile entries and ifdefs for QSV hwaccels
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:22:58 +0000 (17:22 -0300)]
Merge commit '
c833c2034f4ee77fe2ee3470f3f5f84415673b3b'
* commit '
c833c2034f4ee77fe2ee3470f3f5f84415673b3b':
build: Ensure that the "all" target appears before all Makefile includes
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:20:50 +0000 (17:20 -0300)]
Merge commit '
6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'
* commit '
6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a':
build: Have old H.264/HEVC nvenc encoders select their new counterparts
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:09:52 +0000 (17:09 -0300)]
Merge commit '
3e105d08848162b90d886bde59c010d4b0362a4b'
* commit '
3e105d08848162b90d886bde59c010d4b0362a4b':
build: Move entries related to building TOOLS to a subdirectory Makefile
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:06:05 +0000 (17:06 -0300)]
Merge commit '
4104cc56225f29ce1cded8b2876f8748460232a6'
* commit '
4104cc56225f29ce1cded8b2876f8748460232a6':
build: Warn that reconfiguration is necessary if version.h files changed
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:03:31 +0000 (17:03 -0300)]
Merge commit '
f22da2cdf90dc892d483e2d4003cffc0500816f6'
* commit '
f22da2cdf90dc892d483e2d4003cffc0500816f6':
configure: add -fPIE instead of -pie to C flags for ThreadSanitizer
This commit is a noop, see
3f55752cd566c68ff3d3ae984a3936c1d08ef8ca
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:01:01 +0000 (17:01 -0300)]
Merge commit '
404cb74793284aa03e2e1a7e911c980c4cba0e9e'
* commit '
404cb74793284aa03e2e1a7e911c980c4cba0e9e':
configure: Pass CFLAGS_HEADERS through the right CFLAGS filter
Merged-by: James Almer <jamrial@gmail.com>
Hendrik Leppkes [Thu, 13 Apr 2017 09:05:50 +0000 (11:05 +0200)]
Merge commit '
9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'
* commit '
9265364bec0af2e8b7c3a6de7bfc8291a0b70bca':
build: Separate avisynth and avxsynth support
Mostly noop, since it could break linux configure with --enable-avisynth,
and the configure code which was simplified isn't even present in
ffmpeg.
Only merged the cosmetic re-ordering in the Makefile.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Carl Eugen Hoyos [Thu, 13 Apr 2017 06:19:48 +0000 (08:19 +0200)]
tests: Fix gray10 and gray12 references after
c1616b45.
James Almer [Wed, 12 Apr 2017 22:38:17 +0000 (19:38 -0300)]
avcodec/aacenc_ltp: fix use of uninitialized values
Fixes some valgrind warnings.
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Matthew Gregan [Wed, 12 Apr 2017 02:12:17 +0000 (14:12 +1200)]
avformat/movenc: Fix potential leak of sgpd_entries array.
Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>