summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* doc: set documentencoding on toplevel texi files.Nicolas George2015-02-19
| | | | | | Fix double UTF-8 encoding on output files. makeinfo / texi2any does not seem to provide a way of setting it globally for toplevel files.
* avfilter/palettegen: raise cache size from 64k to 512kClément Bœsch2015-02-19
| | | | | | (or 32k to 256k in 32-bit) This is similar to a00bab347518d4824d51ec7078f1d84ca097c53b
* Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'Michael Niedermayer2015-02-19
|\ | | | | | | | | | | | | * commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5': rv40: Return more meaningful error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv40: Return more meaningful error codesHimangi Saraogi2015-02-19
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/wmalosslessdec: use sizeof() instead of a literal numberMichael Niedermayer2015-02-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_subtitles: Add () to protect the argument of the AA() macroMichael Niedermayer2015-02-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/sha: Protect macro arguments with ()Michael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecsMichael Niedermayer2015-02-18
| | | | | | | | | | | | Fixes: CID1270809 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'Michael Niedermayer2015-02-18
|\| | | | | | | | | | | | | | | * commit 'd617e77cecc5b363ef1860955b548f4ac007add6': libx265: Add crf private option See: 8b96e8dd28c83448c9b4af81b834deb9b525be80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Add crf private optionDerek Buitenhuis2015-02-18
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'Michael Niedermayer2015-02-18
|\| | | | | | | | | | | | | | | * commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2': libx265: Reduce the scope of some variables See: b920db67317a31f0e8d4a010faa26dbd12b0dcdb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Reduce the scope of some variablesDerek Buitenhuis2015-02-18
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | tests: fate: adding fate-test for twofishSupraja Meedinti2015-02-18
| | | | | | | | | | Signed-off-by: Supraja Meedinti <supraja0493@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Fix use of uninitialized variable (ret)Michael Niedermayer2015-02-18
| | | | | | | | | | | | Fixed CID1270823 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx265: Add crf private optionDerek Buitenhuis2015-02-18
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | libx265: Reduce the scope of some variablesDerek Buitenhuis2015-02-18
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ffmenc: Fix memleak of bufMichael Niedermayer2015-02-18
| | | | | | | | | | | | Fixes CID1257015 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/showpalette: fix leak in case of errorClément Bœsch2015-02-18
| | | | | | | | | | Fixes CID1270820 Fixes CID1270818
* | avfilter/palettegen: fix leak in case of errorClément Bœsch2015-02-18
| |
* | avfilter/paletteuse: fix leak in case of errorClément Bœsch2015-02-18
| | | | | | | | Fixes CID1270819
* | avfilter/af_channelmap: Move potential dereference after NULL check in ↵Michael Niedermayer2015-02-18
| | | | | | | | | | | | | | | | get_channel_idx() Fixes CID1270822 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_qp: Fix leak of out_qp_table_bufMichael Niedermayer2015-02-18
| | | | | | | | | | | | Fixes CID1270821 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/avfiltergraph: assert that the heap_bubble index is validMichael Niedermayer2015-02-18
| | | | | | | | | | | | This might help coverity Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/faxcompr: Fix memleakMichael Niedermayer2015-02-18
| | | | | | | | | | | | Fixes CID1270816 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/opusdec: remove unused headersPaul B Mahol2015-02-18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_removelogo: Add () to protect the argument of ↵Michael Niedermayer2015-02-18
| | | | | | | | | | | | apply_mask_fudge_factor() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/bayer_template: Add () to protect the argument of BAYER_READ()Michael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | compat/avisynth/windowsPorts/windows2linux: Add () to protect macro argumentsMichael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()Michael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()Michael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: optimize twofish cipherSupraja Meedinti2015-02-18
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d': riff: Support QT RLE Animation in avi ('rle ' FourCC) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Support QT RLE Animation in avi ('rle ' FourCC)Vittorio Giovara2015-02-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4': riff: Support ProRes in avi (APCH fourcc) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Support ProRes in avi (APCH fourcc)Vittorio Giovara2015-02-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | * commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd': wmv2: Return meaningful error codes Conflicts: libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmv2: Return meaningful error codesHimangi Saraogi2015-02-17
| |
* | Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2': qdm2: Return meaningful error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qdm2: Return meaningful error codesHimangi Saraogi2015-02-17
| |
* | Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012': libxvid: Return meaningful error messages Conflicts: libavcodec/libxvid.c libavcodec/libxvid_rc.c See: 2a89afb376aebe833bee0b5958cec16c48936b03 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: Return meaningful error messagesHimangi Saraogi2015-02-17
| |
* | avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failureMichael Niedermayer2015-02-17
| | | | | | | | | | | | This keeps the fields consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | * commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d': aac_adtstoasc_bsf: Check extradata memory allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac_adtstoasc_bsf: Check extradata memory allocationHimangi Saraogi2015-02-17
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | * commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc': avpacket: Check buffer reference Conflicts: libavcodec/avpacket.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: Check buffer referenceVittorio Giovara2015-02-17
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1267889
* | Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | * commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46': vorbisdec: Check memory allocations Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdec: Check memory allocationsVittorio Giovara2015-02-17
| |
* | Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | * commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11': dvdsubdec: Check memory allocations Conflicts: libavcodec/dvdsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>