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

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-23Merge commit '418693bdc5edad72b0d055f741931612d797eb05'Michael Niedermayer
* commit '418693bdc5edad72b0d055f741931612d797eb05': lavc: rewrite and extend AVFrame doxy opt: avoid segfault in av_opt_next() if the class does not have an option list ttadec: fix last frame handling when seeking alacdec: do not be too strict about the extradata size Conflicts: libavcodec/alac.c libavcodec/avcodec.h libavcodec/tta.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23opt: avoid segfault in av_opt_next() if the class does not have an option listJustin Ruggles
CC: libav-stable@libav.org
2012-12-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpegvideo: increase edge_emu_buffer size for VC1 lavc: merge latest x86inc.asm fixes with x264 Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'Michael Niedermayer
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19lavc: merge latest x86inc.asm fixes with x264Ronald S. Bultje
Unbreak NASM support. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-18misc typo, style and wording fixesDiego Biurrun
2012-12-16lavu/pixdesc: fix a const qualifier discarding warning.Clément Bœsch
2012-12-16lavu: make sure av_pix_fmt_desc_next returns a valid pix fmt.Clément Bœsch
This is required because there are some "holes" in the list for compatibility with the fork. The commit also removes the now unecessary check from cmdutils. Found-by: wm4
2012-12-14Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'Michael Niedermayer
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f': asyncts: merge two conditions x86inc: fully concatenate tokens to fix macro expansion for nasm h264: initialize frame-mt context copies properly Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14mem: minor simplification of the alignment hack codeMichael Niedermayer
Idea-by: wanzhang Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14x86inc: fully concatenate tokens to fix macro expansion for nasmJanne Grunau
Fixes build errors with nasm introduced in 6f40e9f070f7 for stack memory alignment. Noticed by BugMaster.
2012-12-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN. x86inc: fix stack alignment on win64 rtpproto: Remove unused defines Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12x86inc: fix stack alignment on win64Ronald S. Bultje
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-12-12x86inc: support stack mem allocation and re-alignment in PROLOGUE.Ronald S. Bultje
Use this in VP8/H264-8bit loopfilter functions so they can be used if there is no aligned stack (e.g. MSVC 32bit or ICC 10.x). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12x86inc: support stack mem allocation and re-alignment in PROLOGUERonald S. Bultje
Use this in VP8/H264-8bit loopfilter functions so they can be used if there is no aligned stack (e.g. MSVC 32bit or ICC 10.x). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-11doxy: add ref for lavfi, lpp and lsws.Clément Bœsch
2012-12-11doxy: fix swr group nameMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-11opt: fix memleak on error of range_arrayMichael Niedermayer
Fixes CID747739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09lavu/opt: change the way ranges are printedStefano Sabatini
2012-12-08lavu/opt: make av_opt_query_ranges_default() return a meaningful error codeStefano Sabatini
2012-12-08lavu/opt: perform misc cosmetical fixesStefano Sabatini
2012-12-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: golomb: use unsigned arithmetics in svq3_get_ue_golomb() x86: float_dsp: fix loading of the len parameter on x86-32 takdec: fix initialisation of LOCAL_ALIGNED array takdec: fix initialisation of LOCAL_ALIGNED array Conflicts: libavcodec/rv30.c libavcodec/svq3.c libavcodec/takdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'Michael Niedermayer
* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f': parser: fix large overreads bitstream: add get_bits64() to support reading more than 32 bits at once arm: detect cpu features at runtime on Linux Conflicts: libavcodec/parser.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'Michael Niedermayer
* commit 'b326755989b346d0d935e0628e8865f9b2951c30': arm: rename ARMVFP config symbol to VFP Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'Michael Niedermayer
* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5': configure: arm: make _inline arch ext symbols depend on inline_asm arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation Conflicts: configure libavcodec/arm/dca.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08x86: float_dsp: fix loading of the len parameter on x86-32Justin Ruggles
2012-12-08opt_list: fix vertical alignment of typesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08opt: print ranges in opt_list()Michael Niedermayer
The formating can and should be improved. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08opt: Add support to query rangesMichael Niedermayer
Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07arm: rename ARMVFP config symbol to VFPMans Rullgard
This is consistent with usual ARM nomenclature as well as with the VFPV3 and NEON symbols which both lack the ARM prefix. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-12-07arm: detect cpu features at runtime on LinuxMans Rullgard
This allows compiling optimised functions for features not enabled in the core build and selecting these at runtime if the system has the necessary support. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-12-07arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilationMans Rullgard
These macros reflect the actual capabilities required here. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-12-07Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'Michael Niedermayer
* commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152': fate: dpcm: Add dependencies SBR DSP x86: implement SSE sbr_hf_gen AAC SBR: use AVFloatDSPContext's vector_fmul fate: image: Add dependencies Changelog: add an entry for deprecating the avconv -vol option x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32 Conflicts: Changelog libavutil/x86/float_dsp.asm tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'Michael Niedermayer
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56': pixdesc: fix yuva 10bit bit depth avconv: deprecate the -vol option x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling x86: af_volume: add SSE2-optimized s16 volume scaling Conflicts: ffmpeg.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'Michael Niedermayer
* commit '9d5c62ba5b586c80af508b5914934b1c439f6652': lavu/opt: do not filter out the initial sign character except for flags eval: treat dB as decibels instead of decibytes float_dsp: add vector_dmul_scalar() to multiply a vector of doubles Conflicts: libavutil/eval.c tests/ref/fate/eval Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32Justin Ruggles
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2012-12-05av_assert should use AV_LOG_PANIC.Reimar Döffinger
The description of AV_LOG_PANIC 100% matches what av_assert does, while AV_LOG_FATAL does not really. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-12-05pixdesc: fix yuva 10bit bit depthPaul B Mahol
It was wrongly set as the yuva 16bit one. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-05x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scalingJustin Ruggles
2012-12-05lavu/opt: do not filter out the initial sign character except for flagsJustin Ruggles
This allows parsing of special-case negative numbers like decibels.
2012-12-05eval: treat dB as decibels instead of decibytesJustin Ruggles
2012-12-05float_dsp: add vector_dmul_scalar() to multiply a vector of doublesJustin Ruggles
Include x86-optimized versions for SSE2 and AVX.
2012-12-05Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05pixdesc: fix broken yuva definitionsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-05Remove pointless #undefs of previously forbidden functions.Anton Khirnov
2012-12-02lavu/channel_layout: document the semantic of layouts.Nicolas George
2012-12-02lavu/parseutils: accept %J for hours >= 24.Nicolas George
Allow to parse durations >= 24:00:00.
2012-12-01lavu/opt: allow to set sample and pixel format with av_opt_set_int()Stefano Sabatini
This change requires the user to specify min and max value, and makes possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if forbidden. Add required ifdeffery in case of mixed libraries, when libavutil is updated but not the other libraries. This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.
2012-12-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: Use headers in the check for _beginthreadex for w32threads avutil: Use a configure check to enable windows console functions avutil: Include io.h with a separate condition from windows console functions Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-30avutil: Use a configure check to enable windows console functionsMartin Storsjö
Not all versions or API subsets of windows have these functions. Signed-off-by: Martin Storsjö <martin@martin.st>