99bcfe6227
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
ac649bb775
Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'
* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
configure: add missing h264_qsv hwaccel deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
841e9f431c
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
560eb7179a
Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
e3755119fa
Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'
* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
pixfmt: add a pixel format for QSV hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0fbb271318
qsv_api: fix building with libmfx disabled
11 years ago
11c22dfd49
configure: add missing h264_qsv hwaccel deps
11 years ago
65da611d34
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
doc/faq: explain DAR/SAR preserving.
doc: set documentencoding on toplevel texi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
fb3fb1d0d4
avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom.
On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.
Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4e08c82110
lavc: add an Intel libmfx-based H.264 decoder
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.
11 years ago
31d2039cb4
h264_parser: export video format and dimensions
11 years ago
5b1d9ceec7
pixfmt: add a pixel format for QSV hwaccel
11 years ago
c49c42a4a3
doc/faq: explain DAR/SAR preserving.
11 years ago
b491751409
doc: set documentencoding on toplevel texi files.
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
11 years ago
2280552057
avfilter/palettegen: raise cache size from 64k to 512k
(or 32k to 256k in 32-bit)
This is similar to a00bab3475
11 years ago
c1ff2cdbca
Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'
* commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
rv40: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0f532fd3f9
rv40: Return more meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
f144e4ddff
avcodec/wmalosslessdec: use sizeof() instead of a literal number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
9d88be6873
avfilter/vf_subtitles: Add () to protect the argument of the AA() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
e0be5c4fbe
avutil/sha: Protect macro arguments with ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
80d278a981
ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs
Fixes: CID1270809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
77c133f7ac
Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'
* commit 'd617e77cecc5b363ef1860955b548f4ac007add6':
libx265: Add crf private option
See: 8b96e8dd28
11 years ago
00acf38379
Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'
* commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
libx265: Reduce the scope of some variables
See: b920db6731
11 years ago
4b7c26843c
tests: fate: adding fate-test for twofish
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
9e008ed1b4
avformat/movenc: Fix use of uninitialized variable (ret)
Fixed CID1270823
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
8b96e8dd28
libx265: Add crf private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
b920db6731
libx265: Reduce the scope of some variables
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
d617e77cec
libx265: Add crf private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
2de887e45b
libx265: Reduce the scope of some variables
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
b68d902b6e
avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c8c10a5fc7
avformat/ffmenc: Fix memleak of buf
Fixes CID1257015
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
8087632027
avfilter/showpalette: fix leak in case of error
Fixes CID1270820
Fixes CID1270818
11 years ago
80f44eafaa
avfilter/palettegen: fix leak in case of error
11 years ago
f40266560b
avfilter/paletteuse: fix leak in case of error
Fixes CID1270819
11 years ago
9f6431c8f6
avfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx()
Fixes CID1270822
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
bdb3194217
avfilter/vf_qp: Fix leak of out_qp_table_buf
Fixes CID1270821
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a76e91bf67
avfilter/avfiltergraph: assert that the heap_bubble index is valid
This might help coverity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
424ed1a83e
avcodec/faxcompr: Fix memleak
Fixes CID1270816
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
956bd71eeb
avcodec/opusdec: remove unused headers
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
8bc80016c1
avfilter/vf_removelogo: Add () to protect the argument of apply_mask_fudge_factor()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d501b986a9
swscale/bayer_template: Add () to protect the argument of BAYER_READ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0babb896b4
compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
b7c19aee6c
avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
dfc2a3982f
avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
092ee6cd32
libavutil: optimize twofish cipher
before:
lavu TWOFISH size: 1048576 runs: 1024 time: 90.052 +- 4.630
after:
lavu TWOFISH size: 1048576 runs: 1024 time: 18.085 +- 0.241
gcrypt TWOFISH size: 1048576 runs: 1024 time: 25.666 +- 0.307
tomcrypt TWOFISH size: 1048576 runs: 1024 time: 18.428 +- 0.363
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
77ae94727f
Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
97bd0e2a93
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d06dce21a4
Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
wmv2: Return meaningful error codes
Conflicts:
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
41572ac698
Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'
* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
qdm2: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d128794fbc
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See: 2a89afb376
11 years ago
Michael Niedermayer
Anton Khirnov
Kevin Wheatley
Nicolas George
Clément Bœsch
Himangi Saraogi
Supraja Meedinti
Derek Buitenhuis
Paul B Mahol