OSDN Git Service
Michael Niedermayer [Wed, 18 May 2016 22:19:52 +0000 (00:19 +0200)]
avcodec/h264: Check init_get_bits8() for failure
Fixes CID1361935
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 18 May 2016 22:10:27 +0000 (00:10 +0200)]
ffmpeg_filter: Fix AVBufferSrcParameters leak
Fixed: CID1361950
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 18 May 2016 21:27:54 +0000 (23:27 +0200)]
avformat/avidec: Detect index with too short entries
Fixes Ticket5498
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 18 May 2016 21:27:20 +0000 (23:27 +0200)]
avcodec/m101: Ask for samples with too small extradata_size
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kyle Swanson [Wed, 11 May 2016 18:30:14 +0000 (13:30 -0500)]
avfilter: add loudnorm
Signed-off-by: Kyle Swanson <k@ylo.ph>
Michael Niedermayer [Wed, 18 May 2016 15:11:20 +0000 (17:11 +0200)]
avcodec/m101: Check BPS value
Fixes null pointer dereference
Fixes Ticket5520
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 18 May 2016 10:46:43 +0000 (12:46 +0200)]
avcodec/iff: add forgotten checks for end of input buffer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 17 May 2016 22:21:29 +0000 (00:21 +0200)]
avcodec/iff: scala anim32 & anim16 decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 17 May 2016 22:53:21 +0000 (00:53 +0200)]
avformat/avio: Fix null pointer dereference in case of memleak
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Yong Lei [Tue, 17 May 2016 20:21:45 +0000 (13:21 -0700)]
avformat/avio: fix memory leak in url_find_protocol
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Chris Cunningham [Tue, 17 May 2016 18:28:32 +0000 (11:28 -0700)]
avformat/utils: Check negative bps before shifting in ff_get_pcm_codec_id()
Fixes: undefined shift.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Tue, 17 May 2016 14:18:43 +0000 (15:18 +0100)]
Merge commit '
71d3305c2711d4f6ec8b92db09ff64cf4e19a58e'
* commit '
71d3305c2711d4f6ec8b92db09ff64cf4e19a58e':
h264_parse: make sure the ref count is zeroed on all failure paths
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 May 2016 14:16:38 +0000 (15:16 +0100)]
Merge commit '
a6e27f7add2698fdd89911632b570c3d0c3f2aaa'
* commit '
a6e27f7add2698fdd89911632b570c3d0c3f2aaa':
h264: factor out parsing the reference count into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 May 2016 13:55:36 +0000 (14:55 +0100)]
Merge commit '
56b17a33f231859cbccbd741b4763617cb4ecf03'
* commit '
56b17a33f231859cbccbd741b4763617cb4ecf03':
h264: stop testing whether the reference count changes in ff_set_ref_count()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 May 2016 13:38:08 +0000 (14:38 +0100)]
Merge commit '
e9f884416c76558098fc1f63825b293956e8483c'
* commit '
e9f884416c76558098fc1f63825b293956e8483c':
h264: move reading direct_spatial_mv_pred out of ff_set_ref_count()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Hendrik Leppkes [Tue, 17 May 2016 12:21:12 +0000 (14:21 +0200)]
Merge commit '
8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6'
* commit '
8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6':
h264_parser: switch to h2645_parse for NAL unescaping
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Thu, 12 May 2016 10:07:40 +0000 (12:07 +0200)]
h2645_parse: support badly muxed mp4 streams
Some streams contain an additional AnnexB NAL inside the mp4/nalff NALU.
This commonly occurs in interlaced streams where both fields are packed
into the same MP4 NAL with an AnnexB startcode in between.
Port handling of this format from the previous h264 nal handling.
Fixes trac #5529
Paul B Mahol [Tue, 17 May 2016 09:01:02 +0000 (11:01 +0200)]
avcodec/iff: fix artifacts with uncompressed ham ANIMs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
ZhouXiaoyong [Fri, 13 May 2016 10:03:27 +0000 (18:03 +0800)]
avcodec/mips/h264dsp_mmi: Version 2 of the optimizations for loongson mmi
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. optimize some unaligned loads and stores
4. use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 16 May 2016 18:45:22 +0000 (15:45 -0300)]
avformat/dtshddec: implement AUPR_HDR chunk parsing
Use it to get stream duration, sample rate, channel count and initial padding
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 16 May 2016 05:13:46 +0000 (02:13 -0300)]
avformat/dtshddec: parse chunks stored after audio data
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Mon, 16 May 2016 20:39:03 +0000 (22:39 +0200)]
avcodec/iff: add support for ANIMs with keyframes and concatenated ANIMs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 16 May 2016 13:37:24 +0000 (15:37 +0200)]
avcodec/iff: check if there is enough bytes left
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 16 May 2016 11:43:02 +0000 (13:43 +0200)]
avformat/utils: Do not compute the bitrate from duration == 0
Fixes division by 0 in fate-acodec-ra144
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 16 May 2016 10:49:06 +0000 (12:49 +0200)]
ffmpeg: Check that r_frame_rate is set before attempting to use it
Avoids unexpected occurance and dependency on NaN behavior and divisions by 0
Testcase: fate-lavf-fate-avi_cram
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 16 May 2016 03:10:21 +0000 (05:10 +0200)]
swresample/resample: Fix division by 0 with tap_count=1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 15 May 2016 19:34:37 +0000 (21:34 +0200)]
swresample/rematrix: Use clipping s16 rematrixing if overflows are possible
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 15 May 2016 17:02:12 +0000 (19:02 +0200)]
avformat/adxdec: set bit_rate, fixes duration calculation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 15 May 2016 16:33:09 +0000 (18:33 +0200)]
swresample/rematrix: Use error diffusion to avoid error in the DC component of the matrix
This fixes the sum of the integer coefficients ending up summing to a value
larger than the value representing unity.
This issue occurs with qN0.dts when converting to stereo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 15 May 2016 12:34:44 +0000 (14:34 +0200)]
avcodec/dsd: Fix "warning: ctables defined but not used [-Wunused-variable]"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 15 May 2016 14:33:33 +0000 (16:33 +0200)]
avcodec/iff: rewrite out of bounds checking in writer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 15 May 2016 02:28:31 +0000 (04:28 +0200)]
avcodec/dstdec: Fix "warning: initialization from incompatible pointer type [enabled by default]"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sun, 15 May 2016 02:00:12 +0000 (23:00 -0300)]
doc/general: update supported DCA extensions
Will Kelleher [Thu, 7 Apr 2016 13:58:31 +0000 (08:58 -0500)]
hevc: Fix memory leak related to a53_caption data
Signed-off-by: Will Kelleher <wkelleher@gogoair.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sat, 14 May 2016 23:25:12 +0000 (01:25 +0200)]
doc/general: mention DST decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 14 May 2016 23:22:36 +0000 (01:22 +0200)]
doc/general: mention WSD demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 14 May 2016 23:17:02 +0000 (01:17 +0200)]
avcodec/escape124: change transitions table type to int8_t
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 14 May 2016 23:19:12 +0000 (01:19 +0200)]
avcodec: bump minor and update Changelog for recent DST addition
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Peter Ross [Thu, 5 May 2016 19:21:27 +0000 (21:21 +0200)]
avcodec: add Direct Stream Transfer (DST) decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
foo86 [Fri, 13 May 2016 09:48:25 +0000 (12:48 +0300)]
avcodec/dca: print error message when no frame is found in packet
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sat, 14 May 2016 12:29:59 +0000 (14:29 +0200)]
avcodec/iff: check for end of buffer in input for delta_l decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
ZhouXiaoyong [Fri, 13 May 2016 10:02:28 +0000 (18:02 +0800)]
avutil/mips: header asmdefs.h add some PTR_ macros for loongson
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 14 May 2016 01:48:56 +0000 (22:48 -0300)]
avutil/lzo: split test out into a separate file
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Thu, 12 May 2016 21:54:26 +0000 (23:54 +0200)]
avcodec/iff: implement 3rd delta ANIM decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Fri, 13 May 2016 20:19:56 +0000 (17:19 -0300)]
avformat/Makefile: fix avlanguage dependencies
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 13 May 2016 19:53:44 +0000 (16:53 -0300)]
avutil/sha512-test: fix memleak
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 13 May 2016 19:53:26 +0000 (16:53 -0300)]
avutil/sha-test: fix memleak
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 13 May 2016 19:53:18 +0000 (16:53 -0300)]
avutil/ripemd-test: fix memleak
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 13 May 2016 19:53:08 +0000 (16:53 -0300)]
avutil/aes-test: fix memleak
Signed-off-by: James Almer <jamrial@gmail.com>
Matthieu Bouron [Sun, 8 May 2016 18:56:03 +0000 (18:56 +0000)]
swresample/arm: add ff_resample_common_apply_filter_{x4,x8}_{float,s16}_neon
Paul B Mahol [Fri, 13 May 2016 12:01:12 +0000 (14:01 +0200)]
avcodec/iff: change delta l offset to uint32_t
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andriy Lysnevych [Thu, 12 May 2016 14:47:09 +0000 (17:47 +0300)]
avcodec/avpacket: Respect payload offset in av_packet_ref
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Tobias Rapp [Thu, 12 May 2016 08:26:03 +0000 (10:26 +0200)]
avformat/dump.c: fix mixed log levels
Previously a partial log message without newline was printed in case of
loglevel=warning.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Tue, 10 May 2016 21:48:50 +0000 (23:48 +0200)]
lavc: add IFF ANIM decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:33:57 +0000 (14:33 +0100)]
Merge commit '
f3ed484953b81856e40239d2410058a96188b2be'
* commit '
f3ed484953b81856e40239d2410058a96188b2be':
h264_mp4toannexb_bsf: do not fail on annex B extradata
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Luca Barbato [Thu, 21 Apr 2016 14:09:38 +0000 (16:09 +0200)]
ape: Unbreak adaptcoeffs computation
And simplify and explain the expression.
Fault introduced in
f3fdef108eb06b1e71b29152bf6822519e787efe
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:29:28 +0000 (14:29 +0100)]
Merge commit '
5fca95c8e515a5ae542d9626ec088bdfc658450e'
* commit '
5fca95c8e515a5ae542d9626ec088bdfc658450e':
libx264: Forbid inverted Stereo3D mode
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:29:04 +0000 (14:29 +0100)]
Merge commit '
9e2af0e9071a1229cfe21efff394691d91f979b2'
* commit '
9e2af0e9071a1229cfe21efff394691d91f979b2':
libx264: Allow Stereo3D monoscopic value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:28:17 +0000 (14:28 +0100)]
Merge commit '
a08b5d7b5725932f4ad39e95c5d6589392dee2c6'
* commit '
a08b5d7b5725932f4ad39e95c5d6589392dee2c6':
build: Silence the lcov-reset target
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:27:49 +0000 (14:27 +0100)]
Merge commit '
75b90ef722b7cdfc70118ab987e298d087aae693'
* commit '
75b90ef722b7cdfc70118ab987e298d087aae693':
libavformat: Update the comment about AVOutputFormat flags
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:27:30 +0000 (14:27 +0100)]
Merge commit '
74383def8f46805faf3391c98516b248108a9a6b'
* commit '
74383def8f46805faf3391c98516b248108a9a6b':
movenc: Handle pts == NOPTS when autoflushing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:26:55 +0000 (14:26 +0100)]
Merge commit '
0abb07bad7026a945a31ba4047e6583c8b3fa3da'
* commit '
0abb07bad7026a945a31ba4047e6583c8b3fa3da':
movenc: Update a comment to reflect how the code actually behaves
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:25:04 +0000 (14:25 +0100)]
Merge commit '
79fdbfdb3e50f3f906903e027714ee04c1a00e89'
This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.
* commit '
79fdbfdb3e50f3f906903e027714ee04c1a00e89':
img2enc: Refactor the atomic renaming code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:20:51 +0000 (14:20 +0100)]
Merge commit '
f3fdef108eb06b1e71b29152bf6822519e787efe'
* commit '
f3fdef108eb06b1e71b29152bf6822519e787efe':
ape: Avoid undefined behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:18:41 +0000 (14:18 +0100)]
Merge commit '
6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5'
This commit is a no-op.
* commit '
6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5':
indeo3: Avoid undefined behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:17:57 +0000 (14:17 +0100)]
Merge commit '
eae2ebded3b801ed55d32746b98db88ffe196f4f'
* commit '
eae2ebded3b801ed55d32746b98db88ffe196f4f':
libxvid: Create extradata in init using a dummy frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:17:08 +0000 (14:17 +0100)]
Merge commit '
785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b'
* commit '
785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b':
pixfmt: fix wrong comment
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 12 May 2016 13:04:02 +0000 (14:04 +0100)]
Merge commit '
06edef3d5e072ef3c4face9ce946d2d9c36cc477'
* commit '
06edef3d5e072ef3c4face9ce946d2d9c36cc477':
Generate the lists of enabled protocols/bsfs from configure.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Carl Eugen Hoyos [Thu, 12 May 2016 07:07:02 +0000 (09:07 +0200)]
lavc/libutvideoenc: Cast an unsigned constant to int.
Fixes the following warning / error:
libavcodec/libutvideoenc.cpp:281:1: warning: narrowing conversion of ‘3221258240u’ from ‘unsigned int’ to ‘int’ inside { } is ill-formed in C++11 [-Wnarrowing]
Fixes ticket #5542.
James Almer [Wed, 11 May 2016 20:03:21 +0000 (22:03 +0200)]
avutil/cpu-test: Fix includes (needed for HAVE_*)
Commit message by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 11 May 2016 20:03:03 +0000 (22:03 +0200)]
avutil/float_dsp-test: Add include config.h for HAVE_*
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Wed, 11 May 2016 21:16:56 +0000 (18:16 -0300)]
avutil: make crypto testprogs include headers only
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 19:43:19 +0000 (20:43 +0100)]
Split drawutils test out into separate file
This was missed during
96d616052b3d39678e477fa10610ca688f46fff9 because
it is not included in FATE.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 19:42:55 +0000 (20:42 +0100)]
avfft-test: Add missing mem.h include
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Christophe Gisquet [Sun, 1 May 2016 13:33:47 +0000 (15:33 +0200)]
lossless audio dsp: unroll
The loops are guaranteed to be at least multiples of 8, so this
unrolling is safe but allows exploiting execution ports.
For int32 version: 68 -> 58c.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 11 May 2016 16:49:57 +0000 (18:49 +0200)]
avcodec/dca_lbr: Fix "warning: missing braces around initializer"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Wed, 11 May 2016 18:46:13 +0000 (19:46 +0100)]
Merge commit '
a0f469da744db83db32f3fe13186ee4aa2bc7dc5'
* commit '
a0f469da744db83db32f3fe13186ee4aa2bc7dc5':
hwcontext: initialize sw_format in av_hwframe_ctx_alloc()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:43:59 +0000 (19:43 +0100)]
Merge commit '
5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'
* commit '
5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
lavc: move the vaapi encoders further down in the list of codecs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:40:30 +0000 (19:40 +0100)]
Merge commit '
92fdea37477b5a2d1329e5ef0773e24473fa8f12'
These are all trivial to merge.
* commit '
92fdea37477b5a2d1329e5ef0773e24473fa8f12':
vaapi_h265: Add -qp option, use it to replace use of -global_quality
vaapi_h265: Add constant-bitrate encode support
vaapi_h264: Add encode quality option (for quality-speed tradeoff)
vaapi_h264: Add -qp option, use it to replace use of -global_quality
vaapi_encode: Add support for codec-local options
vaapi_h264: Add constant-bitrate encode support
vaapi_encode: Refactor slightly to allow easier setting of global options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:28:12 +0000 (19:28 +0100)]
Merge commit '
18019f8cb9663dd1032c65aa453eaec18d641905'
* commit '
18019f8cb9663dd1032c65aa453eaec18d641905':
FATE: add an H.264 test with unescaped extradata
FATE: add an H.264 test with invalid reference lists
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:26:18 +0000 (19:26 +0100)]
Merge commit '
9d4d9be538faa537440fff37d3b7ecf322911a55'
* commit '
9d4d9be538faa537440fff37d3b7ecf322911a55':
libavcodec: Document that encoders may use the framerate field in AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:24:26 +0000 (19:24 +0100)]
Merge commit '
1bb56abb9b37bd208a66164339c92cad59b1087b'
* commit '
1bb56abb9b37bd208a66164339c92cad59b1087b':
omx: Add support for zerocopy input of frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:23:15 +0000 (19:23 +0100)]
Merge commit '
f1cd9b03f3fa875eb5e394281b4b688cec611658'
* commit '
f1cd9b03f3fa875eb5e394281b4b688cec611658':
omx: Add support for broadcom OMX on raspberry pi
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:19:05 +0000 (19:19 +0100)]
Merge commit '
e8919ec486a5559fdcf366e347be0656d904a87f'
* commit '
e8919ec486a5559fdcf366e347be0656d904a87f':
libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:15:06 +0000 (19:15 +0100)]
Merge commit '
b8e899f4bf5f09900aa71552112d32a5566b6baf'
* commit '
b8e899f4bf5f09900aa71552112d32a5566b6baf':
mmaldec: Use imgutils.h for copying frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:14:26 +0000 (19:14 +0100)]
Merge commit '
798845ce7e5b7fdd17c7269c5d267fb487d9c46f'
* commit '
798845ce7e5b7fdd17c7269c5d267fb487d9c46f':
testprogs: Add missing libm.h includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 May 2016 18:10:10 +0000 (19:10 +0100)]
Merge commit '
d12b5b2f135aade4099f4b26b0fe678656158c13'
* commit '
d12b5b2f135aade4099f4b26b0fe678656158c13':
build: Split test programs off into separate files
Some conversions done by: James Almer <jamrial@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Hendrik Leppkes [Wed, 11 May 2016 14:34:57 +0000 (16:34 +0200)]
avcodec/dca_lbr: explicitly initialize structs with zero
This fixes build on MSVC and conforms to the usual init style used.
Derek Buitenhuis [Wed, 11 May 2016 14:11:46 +0000 (15:11 +0100)]
Merge commit '
330177b508420a553083df94f22cbd5142de0f4a'
* commit '
330177b508420a553083df94f22cbd5142de0f4a':
build: Group declarations for hw-accelerated de-/encoding separately
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Timo Rothenpieler [Wed, 11 May 2016 09:52:25 +0000 (11:52 +0200)]
avcodec/nvenc: Write buffPeriod/picTime SEI in both CBR modes
Timo Rothenpieler [Wed, 11 May 2016 08:34:31 +0000 (10:34 +0200)]
avcodec/nvenc: Generate bufferingPeriod/pictureTiming SEI
For some unknown reason enabling these causes propper CBR padding,
so as there are no known downsides just always enable them in CBR mode.
James Almer [Wed, 11 May 2016 02:33:12 +0000 (23:33 -0300)]
aarch64/synth_filter: fix compilation
Signed-off-by: James Almer <jamrial@gmail.com>
Chris Cunningham [Mon, 9 May 2016 22:27:29 +0000 (15:27 -0700)]
libavformat/oggdec: Free stream private when header parsing fails.
Leaking this private structure opens up the possibility that it may
be re-used when parsing later packets in the stream. This is
problematic if the later packets are not the same codec type (e.g.
private allocated during Vorbis parsing, but later packets are Opus
and the private is assumed to be the oggopus_private type in
opus_header()).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rodger Combs [Tue, 10 May 2016 01:52:06 +0000 (20:52 -0500)]
lavfi/drawutils: support NV12 and NV21
James Almer [Wed, 11 May 2016 01:07:19 +0000 (22:07 -0300)]
avcodec/rscc: check input buffer size for deflate mode
Fixes overreads.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
foo86 [Sun, 1 May 2016 15:43:00 +0000 (18:43 +0300)]
avcodec/dca: add DTS Express (LBR) decoder
Signed-off-by: James Almer <jamrial@gmail.com>
Felt, Patrick [Sun, 8 May 2016 04:02:24 +0000 (04:02 +0000)]
avdevice/decklink_dec: Convert decklink input module to use codecpar
There are still a couple of deprecated calls that I’m not sure what to do with.
They are both related to some logic around AVCodecContext.coded_frame.
I couldn’t find anywhere that really documented what that was, or where it was intended to move to.
I left the warnings on.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 10 May 2016 22:00:52 +0000 (00:00 +0200)]
avformat/utils: Check bps before using it in a shift in ff_get_pcm_codec_id()
Fixes undefined shift
Fixes: usan_shift
Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 10 May 2016 21:12:58 +0000 (23:12 +0200)]
avformat/oggparseopus: Check that granule pos is within the supported range
Larger values would imply file durations of astronomic proportions and cause
overflows
Fixes integer overflow
Fixes: usan_int64_overflow
Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jean Delvare [Tue, 10 May 2016 12:50:38 +0000 (14:50 +0200)]
avfilter/delogo: Check that logo area is inside the picture
We can only remove the logo if it is inside the picture. We need at
least one pixel around the logo area for interpolation.
Fixes ticket #5527 (Delogo crash with x=0 and/or y=0).
Signed-off-by: Jean Delvare <jdelvare@suse.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
OSDN Git Service
