summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer2013-02-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary dsputil.h #includesDiego Biurrun2013-02-26
| |
* | Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'Michael Niedermayer2013-02-26
|\| | | | | | | | | | | | | | | * commit '76b19a3984359b3be44d4f7e4e69b7b86729a622': Fix a number of incorrect intmath.h #includes. avconv: remove an unused variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix a number of incorrect intmath.h #includes.Diego Biurrun2013-02-26
| |
| * avconv: remove an unused variableJustin Ruggles2013-02-25
| |
* | Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'Michael Niedermayer2013-02-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cmdutils: only use libavresample when it is enabledJustin Ruggles2013-02-25
| | | | | | | | avprobe and avserver use cmdutils and do not strictly require libavresample.
| * libschroedinger: cosmetics: rename variable avccontext to avctxJustin Ruggles2013-02-25
| | | | | | | | This is consistent with the rest of libavcodec.
| * vorbisenc: cosmetics: rename variable avccontext to avctxJustin Ruggles2013-02-25
| | | | | | | | This is consistent with the rest of libavcodec.
* | Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'Michael Niedermayer2013-02-26
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * vorbisdec: cosmetics: rename variable avccontext to avctxJustin Ruggles2013-02-25
| | | | | | | | This is consistent with the rest of libavcodec.
| * configure: Identify icc compiler with a less ambiguous patternDiego Biurrun2013-02-25
| |
* | Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'Michael Niedermayer2013-02-26
|\| | | | | | | | | | | | | | | | | | | * commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47': configure: Separate "ln" command line arguments Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Separate "ln" command line argumentsDiego Biurrun2013-02-25
| | | | | | | | This is more compatible and not more complicated.
* | ac3enc_template: silence may be used uninitialized in this function warningsMichael Niedermayer2013-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | motion-test: fix warning: dsp_mask is deprecatedMichael Niedermayer2013-02-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/motion-test: set the bitexact flagMichael Niedermayer2013-02-26
| | | | | | | | | | | | this is needed for testing mmx2 functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpx: check if CQ level is in correct boundsslhck2013-02-25
| | | | | | | | | | | | | | 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>
* | libvpx: allow 0 as min quantizer valueslhck2013-02-25
| | | | | | | | | | | | Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: cosmeticsJean First2013-02-25
| | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: make i unsigned, avoid undefined behavior of i++Michael Niedermayer2013-02-25
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: fix integer overflowMichael Niedermayer2013-02-25
| | | | | | | | | | | | | | Its unlikely this affects any valid files. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: update pixfmts_hflipPaul B Mahol2013-02-25
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/hflip: support more formatsPaul B Mahol2013-02-25
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/geq: improve support for formats with alpha planePaul B Mahol2013-02-25
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-25
|\| | | | | | | | | | | | | * qatar/master: vorbisdec: Accept 0 amplitude_bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdec: Accept 0 amplitude_bitsLuca Barbato2013-02-25
| | | | | | | | | | | | | | | | 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.
* | Merge commit '5b47c19bfda92273ae49e83db26a565afcaed80a'Michael Niedermayer2013-02-25
|\| | | | | | | | | | | | | * commit '5b47c19bfda92273ae49e83db26a565afcaed80a': vorbisdec: Add missing checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdec: Add missing checksLuca Barbato2013-02-25
| | | | | | | | | | Rate and order must not be 0 even if the specification does not say that explicitly.
* | Merge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0'Michael Niedermayer2013-02-25
|\| | | | | | | | | | | | | * commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0': vorbisdec: cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdec: cosmeticsLuca Barbato2013-02-25
| | | | | | | | Use the commonly used "if (!var)" instead of "if (var == 0)".
* | Merge commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc'Michael Niedermayer2013-02-25
|\| | | | | | | | | | | | | | | * 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>
| * vorbisdec: Error on bark_map_size equal to 0.Michael Niedermayer2013-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * dsputil_alpha.h: Add missing stddef.h header to fix standalone compilationDiego Biurrun2013-02-24
| |
* | af_biquads: memset(0) cacheMichael Niedermayer2013-02-25
| | | | | | | | | | | | Fixes valgrind warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: make the default of nopts for first_pts actually workMichael Niedermayer2013-02-25
| | | | | | | | | | | | Fixes Ticket2210 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: force a first_pts=0 for the aresample testMichael Niedermayer2013-02-25
| | | | | | | | | | | | This is needed to prevent the next commit from breaking fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Force a first_pts of 0 for the first configuration of -async useMichael Niedermayer2013-02-25
| | | | | | | | | | | | This is very close to what the default does currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: reindent and remove pointless cast in audio_decode_frame() codeStefano Sabatini2013-02-24
| |
* | ffplay: set type for channel_layout AudioParams field to int64_tStefano Sabatini2013-02-24
| | | | | | | | Reflect the type of the corresponding field in lavc/lavfi.
* | lavfi/abuffersink: fix weird indent and spacingStefano Sabatini2013-02-24
| |
* | lavfi/abuffersink: add sample_rates field to AVABufferSinkParamsStefano Sabatini2013-02-24
| | | | | | | | Allow to select sample rates.
* | lavc: change type of AVFrame.channels field from int64_t to intStefano Sabatini2013-02-24
| | | | | | | | | | | | "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.
* | ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer2013-02-24
| | | | | | | | | | | | | | This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix null pointer dereferenceMichael Niedermayer2013-02-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: support a seperate output sample bits.Michael Niedermayer2013-02-24
| | | | | | | | | | | | This avoids user apps having to mangle dither scale. for pcm24 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/avfiltergraph.h: Move public field out of the private fieldsMichael Niedermayer2013-02-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: add duplicate cutoff for compatibilityMichael Niedermayer2013-02-24
| | | | | | | | | | | | | | | | Based on commit 50f4337a2fd3b571b38c9475981e36405d1ca1e1 Author: Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add animated gif decoder testsPaul B Mahol2013-02-24
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | fate: add animated gif demuxer testPaul B Mahol2013-02-24
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>