Kevin Wheatley
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
Clément Bœsch
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
Michael Niedermayer
c1ff2cdbca
Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'
* commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
rv40: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Himangi Saraogi
0f532fd3f9
rv40: Return more meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
Michael Niedermayer
f144e4ddff
avcodec/wmalosslessdec: use sizeof() instead of a literal number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9d88be6873
avfilter/vf_subtitles: Add () to protect the argument of the AA() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e0be5c4fbe
avutil/sha: Protect macro arguments with ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
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
Michael Niedermayer
77c133f7ac
Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'
* commit 'd617e77cecc5b363ef1860955b548f4ac007add6':
libx265: Add crf private option
See: 8b96e8dd28
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
00acf38379
Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'
* commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
libx265: Reduce the scope of some variables
See: b920db6731
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Supraja Meedinti
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
Michael Niedermayer
9e008ed1b4
avformat/movenc: Fix use of uninitialized variable (ret)
Fixed CID1270823
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Derek Buitenhuis
8b96e8dd28
libx265: Add crf private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
b920db6731
libx265: Reduce the scope of some variables
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
d617e77cec
libx265: Add crf private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
2de887e45b
libx265: Reduce the scope of some variables
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Michael Niedermayer
b68d902b6e
avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c8c10a5fc7
avformat/ffmenc: Fix memleak of buf
Fixes CID1257015
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
8087632027
avfilter/showpalette: fix leak in case of error
Fixes CID1270820
Fixes CID1270818
11 years ago
Clément Bœsch
80f44eafaa
avfilter/palettegen: fix leak in case of error
11 years ago
Clément Bœsch
f40266560b
avfilter/paletteuse: fix leak in case of error
Fixes CID1270819
11 years ago
Michael Niedermayer
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
Michael Niedermayer
bdb3194217
avfilter/vf_qp: Fix leak of out_qp_table_buf
Fixes CID1270821
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
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
Michael Niedermayer
424ed1a83e
avcodec/faxcompr: Fix memleak
Fixes CID1270816
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
956bd71eeb
avcodec/opusdec: remove unused headers
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
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
Michael Niedermayer
d501b986a9
swscale/bayer_template: Add () to protect the argument of BAYER_READ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0babb896b4
compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b7c19aee6c
avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
dfc2a3982f
avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Supraja Meedinti
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
Michael Niedermayer
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
Michael Niedermayer
97bd0e2a93
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
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
Michael Niedermayer
41572ac698
Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'
* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
qdm2: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d128794fbc
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See: 2a89afb376 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2e786bc498
avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure
This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
38e867f6c0
Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'
* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
62aec0c2d5
Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
avpacket: Check buffer reference
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7a7b77e6c9
Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
vorbisdec: Check memory allocations
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3d5c0ba816
Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'
* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
dvdsubdec: Check memory allocations
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2a1b79d7e6
Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'
* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
swscale: Check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
880cee0044
Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7'
* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
nutdec: Check memory allocations
Conflicts:
libavformat/nutdec.c
See: 55ae13e3de
See: 269845db86
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
95165f7c1b
avformat/movenc: Fix stts_entries allocation check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
80c5dc5610
Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'
* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
movenc: Check memory allocations
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
575ed4fe37
Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'
* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
beae6ac5db
Merge commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52'
* commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52':
dct-test: Fix initialization syntax
See: 392b4b663c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
563ed912ea
Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'
* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2980c8e7d3
Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'
* commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
lavc: Document interaction between avcodec_open2() and decoding routines
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago