Welcome to mirror list, hosted at ThFree Co, Russian Federation.

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