Age | Commit message (Collapse) | Author |
|
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
Fix a number of incorrect intmath.h #includes.
avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
cmdutils: only use libavresample when it is enabled
libschroedinger: cosmetics: rename variable avccontext to avctx
vorbisenc: cosmetics: rename variable avccontext to avctx
Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
vorbisdec: cosmetics: rename variable avccontext to avctx
configure: Identify icc compiler with a less ambiguous pattern
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
configure: Separate "ln" command line arguments
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
this is needed for testing mmx2 functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
avprobe and avserver use cmdutils and do not strictly require libavresample.
|
|
This is consistent with the rest of libavcodec.
|
|
This is consistent with the rest of libavcodec.
|
|
This is consistent with the rest of libavcodec.
|
|
Check whether CQ level is within qmin..qmax and abort on error. If this isn't properly
set, encoding will fail at the first frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Its unlikely this affects any valid files.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
This is more compatible and not more complicated.
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
* qatar/master:
vorbisdec: Accept 0 amplitude_bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '5b47c19bfda92273ae49e83db26a565afcaed80a':
vorbisdec: Add missing checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0':
vorbisdec: cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc':
vorbisdec: Error on bark_map_size equal to 0.
dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
The specification does not prevent an encoder to write the amplitude 0
as 0 amplitude_bits.
Our get_bits() implementation might not support a zero sized read
properly, thus the additional branch.
|
|
Rate and order must not be 0 even if the specification does not say that
explicitly.
|
|
Use the commonly used "if (!var)" instead of "if (var == 0)".
|
|
The value is used to calculate output LSP curve and a division by zero
and out of array accesses would occur.
CVE-2013-0894
CC: libav-stable@libav.org
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
|
|
Fixes valgrind warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Fixes Ticket2210
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This is needed to prevent the next commit from breaking fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This is very close to what the default does currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Reflect the type of the corresponding field in lavc/lavfi.
|
|
|
|
Allow to select sample rates.
|
|
"channels" is an int in all the other places in the libraries, and the
av_frame_*_channels() accessors return and set an int, so this should not
implicate ABI breaks.
|
|
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This avoids user apps having to mangle dither scale. for pcm24
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Based on
commit 50f4337a2fd3b571b38c9475981e36405d1ca1e1
Author: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Previously avctx->hwaccel would have been set to a dummy value,
now an explicit check is necessary instead.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
|
As the name indicates we can't just assume what the
"opaque" field contains.
This fixes a crash in third-party applications see e.g.:
http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2126
This fixes also FFmpeg trac #2293, which is a different
third-party application.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
|
|