]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 4 Jun 2015 01:47:55 +0000 (03:47 +0200)]
swresample/swresample: Cleanup on init failure.
This avoids leaks if the user doest call swr_close() after a failed init
Found-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 23:22:25 +0000 (01:22 +0200)]
swresample: Add swr_get_out_samples()
Previous version reviewed-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 4 Jun 2015 02:34:31 +0000 (23:34 -0300)]
fate: add missing lavfi indev dependency to closed caption test
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 4 Jun 2015 00:36:30 +0000 (02:36 +0200)]
libswresample/rematrix: Check for malloc errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Tue, 2 Jun 2015 21:46:10 +0000 (03:16 +0530)]
fate: Add Closed caption test
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Wed, 3 Jun 2015 14:00:36 +0000 (16:00 +0200)]
libavutil: Add new fixed dsp functions.
Add functions needed for implementation of fixed point aac dec.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 20:39:27 +0000 (22:39 +0200)]
Revert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference"
This was simply wrong
Found-by: Martin Storsjö
This reverts commit
5d8e4f6da03c0342157e6ac7fab1a8ac3a87a8b0 .
Shivraj Patil [Tue, 2 Jun 2015 08:38:12 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni mc epel functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC uni mc epel functions.
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Tue, 2 Jun 2015 08:38:11 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC mc epel functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC mc epel functions.
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Tue, 2 Jun 2015 08:38:10 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC biw mc functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC biw mc functions (qpel as well as epel) in new file hevc_mc_biw_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 17:23:06 +0000 (19:23 +0200)]
Merge commit '
0289f81241e720452b5a77713488d54d3ec252d7 '
* commit '
0289f81241e720452b5a77713488d54d3ec252d7 ':
aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE
Conflicts:
libavcodec/aacdec.c
Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 17:03:08 +0000 (19:03 +0200)]
Merge commit '
7f596368a404363d72b1be6d16c51420a71bc523 '
* commit '
7f596368a404363d72b1be6d16c51420a71bc523 ':
bink: Factorize bink put_pixel
Conflicts:
libavcodec/bink.c
See:
b3675f890abee0bc446495711223a5c790234672
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 16:51:39 +0000 (18:51 +0200)]
Merge commit '
e97446e600578392549ef6d0191f2020dae7f8bf '
* commit '
e97446e600578392549ef6d0191f2020dae7f8bf ':
configure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 16:41:02 +0000 (18:41 +0200)]
Merge commit '
b9875b497a38f494acb599083b0d004545958697 '
* commit '
b9875b497a38f494acb599083b0d004545958697 ':
configure: Remove unnecessary tests for d3d11va
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 16:26:17 +0000 (18:26 +0200)]
Merge commit '
76eb0950b8d82b1e9617b9c854f091e13bb23131 '
* commit '
76eb0950b8d82b1e9617b9c854f091e13bb23131 ':
configure: Don't run "export $e" for an empty string
Conflicts:
configure
See:
d5db4a7c231975af003de81cf884808da536bc07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 16:14:38 +0000 (18:14 +0200)]
avutil/ppc/cpu: Our code assumes vsx implies altivec, thus assert this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jun 2015 11:04:37 +0000 (13:04 +0200)]
avformat/mov: Retry same packet on IO failure to avoid loosing a packet
Based on patch by: Zhang Rui <bbcallen@gmail.com>
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 27 May 2015 14:33:02 +0000 (16:33 +0200)]
ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow()
This fixes compilation with latest MinGW, it does not seem to affect
MSYS2/MinGW-64.
nu774 [Wed, 3 Jun 2015 05:01:32 +0000 (14:01 +0900)]
aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE
The decoder assigns channels using default channel configuration
for 5.1ch when it parses an ADTS frame header using consecutive
channel ids.
When a PCE comes, it reassigns channels using PCE configuration
using directly the ids provided. They can be arbitrary.
Always use consecutive channel ids to avoid decoding glitches due
spurious reconfigurations due the channel ids mismatch between the
two otherwise-identical channel maps.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Paul B Mahol [Wed, 3 Jun 2015 12:23:59 +0000 (12:23 +0000)]
avfilter/vf_blend: add linearlight and glow mode
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Wed, 3 Jun 2015 00:09:31 +0000 (02:09 +0200)]
bink: Factorize bink put_pixel
And make sure to check INTER_BLOCK as had been fixed by Michael
Niedermayer.
Reported-By: Andreas Cadhalpun
CC: libav-stable@libav.org
Martin Storsjö [Tue, 2 Jun 2015 07:15:57 +0000 (10:15 +0300)]
configure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9
Checking this struct is a bit more natural for this dependency.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 2 Jun 2015 07:12:51 +0000 (10:12 +0300)]
configure: Remove unnecessary tests for d3d11va
These are only necessary once/if avconv gets support for this hwaccel.
While that obviously is desireable, we don't have it yet, and they
currently only are a distraction.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 2 Jun 2015 19:55:52 +0000 (22:55 +0300)]
configure: Don't run "export $e" for an empty string
This fixes the side effect of printing the whole environment,
if no --env parameter was provided.
Signed-off-by: Martin Storsjö <martin@martin.st>
Shivraj Patil [Tue, 2 Jun 2015 08:38:09 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uniw mc functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC uniw mc functions (qpel as well as epel) in new file hevc_mc_uniw_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 19:35:02 +0000 (21:35 +0200)]
avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec
This is the maximum rate possible based on the frame size limit of MXF D-10
Previous version reviewed by tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ganesh Ajjanagadde [Wed, 3 Jun 2015 03:17:48 +0000 (23:17 -0400)]
swresample/dither: check memory allocation
check memory allocation in swri_get_dither()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Donny Yang [Tue, 2 Jun 2015 15:49:22 +0000 (15:49 +0000)]
avcodec/apng: Remove blending support for AV_PIX_FMT_ARGB
ARGB is not a supported PNG pixel format
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 22:48:29 +0000 (00:48 +0200)]
swresample: Check the return value of resampler->init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 20:41:53 +0000 (22:41 +0200)]
Merge commit '
876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de '
* commit '
876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de ':
configure: don't enable tls protocols if network is disabled
Conflicts:
configure
See:
7fc6545d5d7301196d1c23a45a24a9707bac0060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 30 May 2015 17:40:22 +0000 (19:40 +0200)]
libopenjpegdec: register logging callback functions
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sun, 31 May 2015 22:16:29 +0000 (00:16 +0200)]
libopenjpegenc: use variable instead of type for sizeof
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sun, 31 May 2015 22:51:30 +0000 (00:51 +0200)]
libopenjpegenc: add NULL check for img before accessing it
If opj_image_create fails to allocate an image it returns NULL, which
causes a segmentation fault at 'img->x0 = 0'.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Tue, 2 Jun 2015 20:14:06 +0000 (22:14 +0200)]
configure: Remove now redundant vsx setting code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 2 Jun 2015 16:24:21 +0000 (13:24 -0300)]
configure: don't enable tls protocols if network is disabled
This was a regression introduced with
d8ffb2055f0e0fcb5d025bab72eb19c2a886c125 .
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Tue, 2 Jun 2015 19:12:45 +0000 (19:12 +0000)]
avfilter/vf_blend: add hardmix mode
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 2 Jun 2015 18:54:37 +0000 (18:54 +0000)]
avfilter/vf_blend: fix vividlight blend mode
Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 2 Jun 2015 18:48:32 +0000 (18:48 +0000)]
avfilter/vf_blend: clip result for divide blend mode
Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 2 Jun 2015 17:53:17 +0000 (19:53 +0200)]
configure: Do not dump the whole environment to stdout
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 17:14:40 +0000 (19:14 +0200)]
Merge commit '
fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d '
* commit '
fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d ':
configure: Use pkg-config for fdk-aac
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 17:03:02 +0000 (19:03 +0200)]
Merge commit '
604abd025dac4cc73a2f6b0c000c3695c16fb000 '
* commit '
604abd025dac4cc73a2f6b0c000c3695c16fb000 ':
configure: Provide an option to override the environment
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 16:54:57 +0000 (18:54 +0200)]
Merge commit '
06db45523c1068c24f049ef2b20fcdead3bf36d8 '
* commit '
06db45523c1068c24f049ef2b20fcdead3bf36d8 ':
configure: Support the extended pkgconf syntax
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 12:58:20 +0000 (14:58 +0200)]
avformat/sbgdec: Check alloc_array_elem() return value
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 13:41:44 +0000 (15:41 +0200)]
avcodec/flacenc: Simplify sizeof()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 13:18:23 +0000 (15:18 +0200)]
avcodec/proresenc_anatoliy: Check av_frame_alloc() return code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 13:16:45 +0000 (15:16 +0200)]
compat/os2threads: Check av_malloc() return code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 12:45:08 +0000 (14:45 +0200)]
ffserver: check return code of avio_alloc_context()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 31 May 2015 11:11:10 +0000 (13:11 +0200)]
avformat/mxfdec: return error instead of segfaulting if there are no streams
Fixes segfault from ticket 4350
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
周晓勇 [Tue, 2 Jun 2015 03:32:31 +0000 (11:32 +0800)]
avcodec: loongson3 optimized h264chroma put and avg with mmi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 10 May 2015 18:52:30 +0000 (20:52 +0200)]
configure: Use pkg-config for fdk-aac
Makes the life of the people already setting PKG_CONFIG_PATH simpler.
Luca Barbato [Wed, 6 May 2015 11:37:31 +0000 (13:37 +0200)]
configure: Provide an option to override the environment
Useful to have `make config` work with custom pkgconf path.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 31 May 2015 14:47:46 +0000 (16:47 +0200)]
configure: Support the extended pkgconf syntax
Make possible to require a combination of
packages and/or pin specific versions.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Shivraj Patil [Fri, 29 May 2015 06:50:26 +0000 (12:20 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functions (qpel as well as epel) in new file hevc_mc_bi_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Adds HEVC specific macros (needed for this patch) in libavcodec/mips/hevc_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 21:08:24 +0000 (23:08 +0200)]
Merge commit '
8349bedfa5eac7f261ac43053a2f66b894bac288 '
* commit '
8349bedfa5eac7f261ac43053a2f66b894bac288 ':
configure: Remove some unnecessary exported config items
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 21:07:32 +0000 (23:07 +0200)]
Merge commit '
ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7 '
* commit '
ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7 ':
configure: Require LPDIRECT3DSURFACE9 for dxva2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 20:58:57 +0000 (22:58 +0200)]
Merge commit '
172b2cee17a3779c114ba065dd7b25dcf61e408f '
* commit '
172b2cee17a3779c114ba065dd7b25dcf61e408f ':
dxva2: Add ifdefs around structs that might not be available
Conflicts:
libavcodec/dxva2.c
See:
94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 1 Jun 2015 19:42:37 +0000 (16:42 -0300)]
configure: don't enable any tls protocol if network is disabled
This was a regression introduced with
4a006b9eb7e7d736fd00e6045b5612978ef6404b .
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 1 Jun 2015 20:30:30 +0000 (22:30 +0200)]
avcodec/snowenc: avoid floats in the rangecoder initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 1 Jun 2015 10:46:40 +0000 (13:46 +0300)]
configure: Remove some unnecessary exported config items
The only need to be listed if they are to be used in ifdefs from
within the code - config items used as dependencies only within
configure don't need to be exported.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 1 Jun 2015 09:06:08 +0000 (12:06 +0300)]
configure: Require LPDIRECT3DSURFACE9 for dxva2
This fixes dxva2 detection (i.e. correctly realizes that it isn't
available) for WinRT, where dxva2api.h does exist, but these definitions
are omitted (when targeting the API subsets).
Ideally we should rather check for e.g. DXVA2_ConfigPictureDecode,
but configure might fail to find that definition due to _WIN32_WINNT
not being set to the right value during configure. (libavcodec/dxva2.h
manually overrides the _WIN32_WINNT define.)
This allows removing hardcoded --disable-dxva2 from such build
configurations.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 1 Jun 2015 09:16:51 +0000 (12:16 +0300)]
dxva2: Add ifdefs around structs that might not be available
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 1 Jun 2015 19:49:14 +0000 (21:49 +0200)]
avcodec/rangecoder: avoid float operation
Use integers, avoid potential rounding issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 1 Jun 2015 16:55:08 +0000 (13:55 -0300)]
avcodec/Makefile: fix checkheaders for nvenc_b
Signed-off-by: James Almer <jamrial@gmail.com>
Stefano Sabatini [Mon, 1 Jun 2015 15:15:20 +0000 (17:15 +0200)]
doc/formats.texi: document max_interlave_delta muxing option
The option was added in commit
d9ae1031f5edbd25c8526b4cb51aba66d3bee931
but it was never documented. The text is based on the one written by the
commit author for the corresponding AVFormatContext.max_interleave_delta
field.
Michael Niedermayer [Mon, 1 Jun 2015 15:54:58 +0000 (17:54 +0200)]
avformat/movenc: Fix potential signed overflows
Fixes CID1302838
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 1 Jun 2015 15:17:44 +0000 (11:17 -0400)]
vp9: clamp final zero MV if find_ref_mvs() found no suitable candidates.
This may actually result in a non-zero MV. Fixes ticket 4583.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 15:13:01 +0000 (17:13 +0200)]
Merge commit '
28fa58cf5d939151108345d7ddddebbd51d9b684 '
* commit '
28fa58cf5d939151108345d7ddddebbd51d9b684 ':
dxva2: Fix build when only D3D11 or DXVA2 is used
Conflicts:
libavcodec/dxva2_internal.h
See:
94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 15:09:25 +0000 (17:09 +0200)]
Merge commit '
31de41babcd96f8ac2e6632454737aecb3710df7 '
* commit '
31de41babcd96f8ac2e6632454737aecb3710df7 ':
configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Conflicts:
configure
See:
a838b22bd9f75028cdfb55bf9b322b3f3544421b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 15:01:12 +0000 (17:01 +0200)]
Michael Niedermayer [Mon, 1 Jun 2015 15:00:24 +0000 (17:00 +0200)]
Michael Niedermayer [Mon, 1 Jun 2015 14:22:27 +0000 (16:22 +0200)]
avutil/float_dsp: Fix ambiguous wording about vector products
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 29 May 2015 21:53:52 +0000 (23:53 +0200)]
avformat/mxfenc: Correct klv_fill_key
See SMPTE 377-1-2009 6.3.3 KLV Fill Items
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 09:29:01 +0000 (11:29 +0200)]
Merge commit '
63ce9fd23cfa5ac0d9a862be0da138108dc1c505 '
* commit '
63ce9fd23cfa5ac0d9a862be0da138108dc1c505 ':
rtmpdh: Use GMP functions directly, instead of nettle wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 09:27:56 +0000 (11:27 +0200)]
Merge commit '
84c5ff911f3f0557c8f97a964f74ceb01dd6d214 '
* commit '
84c5ff911f3f0557c8f97a964f74ceb01dd6d214 ':
rtmpdh: Fix the indentation in a struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Steve Lhomme [Tue, 26 May 2015 06:45:44 +0000 (08:45 +0200)]
dxva2: Fix build when only D3D11 or DXVA2 is used
Signed-off-by: Martin Storsjö <martin@martin.st>
Steve Lhomme [Tue, 26 May 2015 06:45:43 +0000 (08:45 +0200)]
configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Fixes build with some mingw-w64 versions, that have got the header
but not the interface declaration.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 26 May 2015 06:45:42 +0000 (08:45 +0200)]
h264: Fix HWACCEL_MAX for D3D11
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 26 May 2015 06:45:41 +0000 (08:45 +0200)]
hevc: Fix HWACCEL_MAX for D3D11
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 31 May 2015 20:46:56 +0000 (23:46 +0300)]
rtmpdh: Use GMP functions directly, instead of nettle wrappers
mpz_import and mpz_export were added in GMP 4.1, in 2002.
This simplifies the DH code by clarifying that it only uses pure
bignum functions, no other parts of nettle/hogweed.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 30 May 2015 19:19:35 +0000 (22:19 +0300)]
rtmpdh: Fix the indentation in a struct
Signed-off-by: Martin Storsjö <martin@martin.st>
James Almer [Mon, 1 Jun 2015 03:52:28 +0000 (00:52 -0300)]
nvenc: remove cuda.h requirement for nvenc_a
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 1 Jun 2015 02:39:56 +0000 (04:39 +0200)]
avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 02:06:25 +0000 (04:06 +0200)]
avutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now support ppc64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 02:05:04 +0000 (04:05 +0200)]
avformat/utils: Simplify get_std_framerate() check
This also avoids using a floating point operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 01:13:03 +0000 (03:13 +0200)]
Merge commit '
b08caa87c35a768ec0abb16b1e99c3a85f1df28e '
* commit '
b08caa87c35a768ec0abb16b1e99c3a85f1df28e ':
nvenc: H264 and HEVC encoders
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/version.h
This implementation is merged under the name nvenc_b*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:57:51 +0000 (02:57 +0200)]
avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:46:56 +0000 (02:46 +0200)]
Merge commit '
522d971c7f5921bebcea2fc50e67056afdabb951 '
* commit '
522d971c7f5921bebcea2fc50e67056afdabb951 ':
xsub: Check memory allocation
Conflicts:
libavcodec/xsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:43:02 +0000 (02:43 +0200)]
Michael Niedermayer [Mon, 1 Jun 2015 00:41:45 +0000 (02:41 +0200)]
Merge commit '
e1ea365f7e1477c78865b866a180712174536c20 '
* commit '
e1ea365f7e1477c78865b866a180712174536c20 ':
truemotion2: Check memory allocation
Conflicts:
libavcodec/truemotion2.c
See:
d49f2603bedb780a6cedff4ac790605679cf4029
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:37:30 +0000 (02:37 +0200)]
Merge commit '
28fb80dcbf6f63eedfcfffc725a6bf0069d03fab '
* commit '
28fb80dcbf6f63eedfcfffc725a6bf0069d03fab ':
svq1: Check memory allocation
Conflicts:
libavcodec/svq1enc.c
See:
2a3af77284412b56eb0085f4b97d9db5aa04a64f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:26:03 +0000 (02:26 +0200)]
Merge commit '
42df71d9bbb1a5b4bce0bb34417692565c72d390 '
* commit '
42df71d9bbb1a5b4bce0bb34417692565c72d390 ':
ratecontrol: Check memory allocation
Conflicts:
libavcodec/ratecontrol.c
See:
0898a6d4e4b669704fce663f610aa43dd7483fe9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:25:04 +0000 (02:25 +0200)]
Merge commit '
0994e142132200c706f704271b5a7ae81d128f5c '
* commit '
0994e142132200c706f704271b5a7ae81d128f5c ':
pthread: Check memory allocation
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:23:32 +0000 (02:23 +0200)]
Merge commit '
03927cb73399e6f07185fc7f8851d7612b4187b6 '
* commit '
03927cb73399e6f07185fc7f8851d7612b4187b6 ':
psymodel: Check memory allocation
Conflicts:
libavcodec/psymodel.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:12:26 +0000 (02:12 +0200)]
Merge commit '
fef2f4722bcbfe1c3802898b0f5deb6356132c91 '
* commit '
fef2f4722bcbfe1c3802898b0f5deb6356132c91 ':
xvid: Check memory allocation
See:
5c95de150f3b18f2e76fed670d6ea579feab1206 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:11:01 +0000 (02:11 +0200)]
Merge commit '
9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e '
* commit '
9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e ':
x264: Check memory allocation
See:
066dc0437368acd21546ee327a0a94c60c3808b2 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jun 2015 00:10:30 +0000 (02:10 +0200)]
Merge commit '
41658bc88553dab8499e4dfca311559dcbae2674 '
* commit '
41658bc88553dab8499e4dfca311559dcbae2674 ':
libtheora: Check memory allocation
Conflicts:
libavcodec/libtheoraenc.c
See:
67d4d5f5db060fece8cc8e925f18f0a1c48813c6
See:
27216bf314c62125c408be1a5a79e5c9dba88e76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 31 May 2015 23:59:52 +0000 (01:59 +0200)]
Merge commit '
8df5fbf0b0c0ba12b033e61c28fc240f4bccba47 '
* commit '
8df5fbf0b0c0ba12b033e61c28fc240f4bccba47 ':
lcl: Check memory allocation
Conflicts:
libavcodec/lclenc.c
See:
6dbcecd78e022493866fe39e30743284acc550b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 31 May 2015 23:58:05 +0000 (01:58 +0200)]
Merge commit '
7ca603f96f93d988e01d161d611f69a4ecaa3f02 '
* commit '
7ca603f96f93d988e01d161d611f69a4ecaa3f02 ':
jpegls: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 31 May 2015 23:52:01 +0000 (01:52 +0200)]
Michael Niedermayer [Sun, 31 May 2015 23:44:44 +0000 (01:44 +0200)]
Merge commit '
7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8 '
* commit '
7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8 ':
eatgv: Check memory allocation
Conflicts:
libavcodec/eatgv.c
See:
a5615b82eb116e9fd0f71f2b03c333cc31ab706a
Merged-by: Michael Niedermayer <michaelni@gmx.at>