Michael Niedermayer
da05c62499
Merge commit '8349bedfa5eac7f261ac43053a2f66b894bac288'
...
* commit '8349bedfa5eac7f261ac43053a2f66b894bac288':
configure: Remove some unnecessary exported config items
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
9ac3417c6b
Merge commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7'
...
* commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7':
configure: Require LPDIRECT3DSURFACE9 for dxva2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
14617e3a73
Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'
...
* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
dxva2: Add ifdefs around structs that might not be available
Conflicts:
libavcodec/dxva2.c
See: 94d07b314a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
James Almer
7fc6545d5d
configure: don't enable any tls protocol if network is disabled
...
This was a regression introduced with 4a006b9eb7
.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
Michael Niedermayer
89fa32e5b4
avcodec/snowenc: avoid floats in the rangecoder initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Martin Storsjö
8349bedfa5
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>
10 years ago
Martin Storsjö
ff7ae4b9df
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>
10 years ago
Martin Storsjö
172b2cee17
dxva2: Add ifdefs around structs that might not be available
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
f805d7be4c
avcodec/rangecoder: avoid float operation
...
Use integers, avoid potential rounding issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
James Almer
3be811a528
avcodec/Makefile: fix checkheaders for nvenc_b
...
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
Stefano Sabatini
56fe1bb9b3
doc/formats.texi: document max_interlave_delta muxing option
...
The option was added in commit d9ae1031f5
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.
10 years ago
Michael Niedermayer
627dd7fe7e
avformat/movenc: Fix potential signed overflows
...
Fixes CID1302838
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Ronald S. Bultje
138581c41a
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>
10 years ago
Michael Niedermayer
deed77ffee
Merge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'
...
* commit '28fa58cf5d939151108345d7ddddebbd51d9b684':
dxva2: Fix build when only D3D11 or DXVA2 is used
Conflicts:
libavcodec/dxva2_internal.h
See: 94d07b314a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3f36607ef0
Merge commit '31de41babcd96f8ac2e6632454737aecb3710df7'
...
* commit '31de41babcd96f8ac2e6632454737aecb3710df7':
configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Conflicts:
configure
See: a838b22bd9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
df19c17ffb
Merge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'
...
* commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63':
h264: Fix HWACCEL_MAX for D3D11
See: 1b236541a6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
9cedb88f46
Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'
...
* commit '674b79148ff29f40cbd569f5585bf99c71204bf5':
hevc: Fix HWACCEL_MAX for D3D11
See: 688147cfe2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
030c20ffcf
avutil/float_dsp: Fix ambiguous wording about vector products
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
2e92a27a90
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>
10 years ago
Michael Niedermayer
589d39c768
Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'
...
* commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505':
rtmpdh: Use GMP functions directly, instead of nettle wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8939667b70
Merge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214'
...
* commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214':
rtmpdh: Fix the indentation in a struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Steve Lhomme
28fa58cf5d
dxva2: Fix build when only D3D11 or DXVA2 is used
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Steve Lhomme
31de41babc
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>
10 years ago
Michael Niedermayer
08d006f5a8
h264: Fix HWACCEL_MAX for D3D11
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
674b79148f
hevc: Fix HWACCEL_MAX for D3D11
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
63ce9fd23c
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>
10 years ago
Martin Storsjö
84c5ff911f
rtmpdh: Fix the indentation in a struct
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
James Almer
f10497042f
nvenc: remove cuda.h requirement for nvenc_a
...
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
Michael Niedermayer
a1957a4dc1
avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
9806cca1eb
avutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now support ppc64
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
1e0c34fe71
avformat/utils: Simplify get_std_framerate() check
...
This also avoids using a floating point operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d8bbb99c51
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>
10 years ago
Michael Niedermayer
d0d0913702
avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
211dcdca5c
Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'
...
* commit '522d971c7f5921bebcea2fc50e67056afdabb951':
xsub: Check memory allocation
Conflicts:
libavcodec/xsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
1dc58965fd
Merge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1'
...
* commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1':
wma: Check memory allocation
See: 8559a71415
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
07f606b4f0
Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'
...
* commit 'e1ea365f7e1477c78865b866a180712174536c20':
truemotion2: Check memory allocation
Conflicts:
libavcodec/truemotion2.c
See: d49f2603be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
f24b7d7616
Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'
...
* commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab':
svq1: Check memory allocation
Conflicts:
libavcodec/svq1enc.c
See: 2a3af77284
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
abee1972ef
Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'
...
* commit '42df71d9bbb1a5b4bce0bb34417692565c72d390':
ratecontrol: Check memory allocation
Conflicts:
libavcodec/ratecontrol.c
See: 0898a6d4e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6ed8341cb1
Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'
...
* commit '0994e142132200c706f704271b5a7ae81d128f5c':
pthread: Check memory allocation
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
615e73ab4f
Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'
...
* commit '03927cb73399e6f07185fc7f8851d7612b4187b6':
psymodel: Check memory allocation
Conflicts:
libavcodec/psymodel.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
1a903f0d1e
Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'
...
* commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91':
xvid: Check memory allocation
See: 5c95de150f
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8b94cee99b
Merge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e'
...
* commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e':
x264: Check memory allocation
See: 066dc04373
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
fb7b5dc0e6
Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'
...
* commit '41658bc88553dab8499e4dfca311559dcbae2674':
libtheora: Check memory allocation
Conflicts:
libavcodec/libtheoraenc.c
See: 67d4d5f5db
See: 27216bf314
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3377f6fd15
Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'
...
* commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47':
lcl: Check memory allocation
Conflicts:
libavcodec/lclenc.c
See: 6dbcecd78e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
513673a84d
Merge commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02'
...
* commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02':
jpegls: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
73e150fff7
Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'
...
* commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9':
huffyuv: Check memory allocation
See: 4a722a5cab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
10531d48a0
Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'
...
* commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8':
eatgv: Check memory allocation
Conflicts:
libavcodec/eatgv.c
See: a5615b82eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3a8b16f78e
Merge commit '69277069dd225f5ae02f0215e877a06522d834d3'
...
* commit '69277069dd225f5ae02f0215e877a06522d834d3':
dct: Check memory allocation
Conflicts:
libavcodec/dct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7110b024a9
Merge commit 'e524f37356156893cae50fc46451bd4a6198703d'
...
* commit 'e524f37356156893cae50fc46451bd4a6198703d':
asv: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e7a65142b9
avcodec/aacpsy: Clear the correct pointer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago