summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | vorbisdec: propagate errors from setup_classifs()Michael Niedermayer2013-07-01
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Avoid a null pointer dereference after oom on frame size change in mpegvideo.c.Carl Eugen Hoyos2013-06-30
| | | | | | | | | | | | Fixes ticket #2735.
* | | Avoid a null pointer dereference on oom in the aac encoder.Carl Eugen Hoyos2013-06-30
| |/ |/| | | | | Fixes ticket #2732.
* | indeo3: check return values of av_malloc()Paul B Mahol2013-06-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Support compilation on aix with gcc. Rename "AVClass class" as "AVClass component_class". Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE. Rename thread_init() in libavcodec and libavfilter as library_thread_init(). Rename constant HZ in af_biquads.c as HERTZ. Drop local lable from ppc asm timer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Support compilation on aix with gcc.Carl Eugen Hoyos2013-06-30
| | | | | | | | | | | | | | | Shared libraries and the IBM compiler are currently not supported. "--arch=ppc" has to be passed to configure, uname is not compatible.
| * | Rename "AVClass class" as "AVClass component_class".Carl Eugen Hoyos2013-06-30
| | | | | | | | | | | | The aix header math.h defines "extern int class()" for C.
| * | Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.Carl Eugen Hoyos2013-06-30
| | | | | | | | | | | | The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.
| * | Rename thread_init() in libavcodec and libavfilter as library_thread_init().Carl Eugen Hoyos2013-06-30
| | | | | | | | | | | | The aix header sys/thread.h contains a definition for thread_init().
| * | Rename constant HZ in af_biquads.c as HERTZ.Carl Eugen Hoyos2013-06-30
| | | | | | | | | | | | The aix header sys/m_param.h defines HZ as _HZ.
| * | Drop local lable from ppc asm timer.Carl Eugen Hoyos2013-06-30
| | | | | | | | | | | | The aix assembler does not support local lables.
* | | avutil/x86: disable ff_evaluate_lls_sse2() for 32bitMichael Niedermayer2013-06-30
| | | | | | | | | | | | | | | | | | It just segfaults on 32bit, thus its disabled until someone fixes it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | flac_parser: check return value of av_fifo_alloc()Paul B Mahol2013-06-30
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | lavf/movenc: use ffio_fill()Matthieu Bouron2013-06-30
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mpegts: use seek_back() for all seek backsMichael Niedermayer2013-06-30
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mpegts: factor seek_back() outMichael Niedermayer2013-06-30
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mpegts_read_header: goto fail instead of return directlyMichael Niedermayer2013-06-30
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-30
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mjpeg: Check the unescaped size for overflows Conflicts: libavcodec/mjpegdec.c See: a9456c7c5ca883b5a3947e59a9fba5587e18e119 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mjpeg: Check the unescaped size for overflowsLuca Barbato2013-06-30
| | | | | | | | | | | | | | | | | | | | | | | | And contextually check init_get_bits success and fix the reporting message. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | | Merge commit '7520d9779c6d30b385df5a0a42da508238076192'Michael Niedermayer2013-06-30
|\| | | |/ |/| | | | | | | | | | | | | | | * commit '7520d9779c6d30b385df5a0a42da508238076192': mjpeg: Move code out of else branch Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Move code out of else branchLuca Barbato2013-06-30
| | | | | | | | Simplify the control flow and spare some vertical space.
* | Merge commit '7798a59dc14ae27efe64e639a42646002608a908'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | * commit '7798a59dc14ae27efe64e639a42646002608a908': avconv: Don't include colorspace.h No change as the commit is already part of ffmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Don't include colorspace.hDerek Buitenhuis2013-06-29
| | | | | | | | | | | | | | The header is private, and avconv.c doesn't use it for anything. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '02ec656af72030eea4f3d63e30b25625cce6a3df'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | | | | | * commit '02ec656af72030eea4f3d63e30b25625cce6a3df': wmapro: error out on impossible scale factor offsets The check is replaced by an assert(), as the condition cannot be true except through bugs elsewhere (which should have been fixed already) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmapro: error out on impossible scale factor offsetsLuca Barbato2013-06-29
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a': wmapro: check the min_samples_per_subframe Conflicts: libavcodec/wmaprodec.c See: 9166f483c52e7e0a031a7bb149bea16aaa72f344 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmapro: check the min_samples_per_subframeLuca Barbato2013-06-29
| | | | | | | | | | | | | | Must be at least WMAPRO_BLOCK_MIN_SIZE. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '183880cfc4aae53ce504e13337791cad5841c80c'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | * commit '183880cfc4aae53ce504e13337791cad5841c80c': pictor: use the correct logging context No change, as this has already been fixed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pictor: use the correct logging contextLuca Barbato2013-06-29
| | | | | | | | Broken in 6d97484d72e33f7dde9493a9ead1a72e2f029605
* | avcodec/lpc: Use a function pointer from an initialized contextMichael Niedermayer2013-06-30
| | | | | | | | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | | | * commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740': lpc: use levinson for the first pass of multipass cholesky Conflicts: libavcodec/lpc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lpc: use levinson for the first pass of multipass choleskyLoren Merritt2013-06-29
| | | | | | | | | | | | | | Levinson is faster, and cholesky is only needed if we want to apply different weights to different samples, which doesn't happen on the first pass. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | | | * commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191': x86: lpc: simd av_evaluate_lls Conflicts: libavutil/x86/lls.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lpc: simd av_evaluate_llsLoren Merritt2013-06-29
| | | | | | | | | | | | 1.5x-1.8x faster on sandybridge Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lls.asm: disable ff_update_lls_avxMichael Niedermayer2013-06-30
| | | | | | | | | | | | The code doesnt build with yasm from ubuntu 12.04 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lls.asm: put avx code under if HAVE_AVX_EXTERNALMichael Niedermayer2013-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '502ab21af0ca68f76d6112722c46d2f35c004053': x86: lpc: simd av_update_lls The versions are bumped due to changes in lls.h which is used across libraries affecting intra library ABI (This version bump also covers changes to lls.h in the immedeatly previous commits) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lpc: simd av_update_llsLoren Merritt2013-06-29
| | | | | | | | | | | | 4x-6x faster on sandybridge Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | * commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2': lpc: use function pointers, in preparation for asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lpc: use function pointers, in preparation for asmLoren Merritt2013-06-29
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | * commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b': lpc: remove "decay" argument Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lpc: remove "decay" argumentLoren Merritt2013-06-29
| | | | | | | | | | | | We never used the rolling-average mode, and this makes av_update_lls 15% faster. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | get_xbits: assert validity of the number of bitsMichael Niedermayer2013-06-30
| | | | | | | | | | | | similar is already done in the other get_bits() functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 4xm: Dont ignore dc run errorsMichael Niedermayer2013-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 4xm: check for invalid zero ac coeffsMichael Niedermayer2013-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg_decode_dc: check code before using it in get_xbits()Michael Niedermayer2013-06-30
| | | | | | | | | | | | Fixes undefined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Don't include colorspace.hDerek Buitenhuis2013-06-29
| | | | | | | | | | | | | | The header is private, and ffmpeg.c doesn't use it for anything. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | get_pix_fmt_score: favor equal formats if all else equalMichael Niedermayer2013-06-29
| | | | | | | | | | | | Fixes Ticket2578 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update all trac links to use the trac subdomainMichael Niedermayer2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-29
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Avoid a null pointer dereference on clean-up after oom in ac3 encoder. Merged-by: Michael Niedermayer <michaelni@gmx.at>