summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "lavc: remove a half-working attempt at different defaults for ↵Michael Niedermayer2011-07-112-3/+3
| | | | | | audio/video codecs." This reverts commit 18c007ba37b2c7dee5bd2f1a3eb3bfee9b6b3d26.
* Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-1137-163/+359
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: fix crash with dithering due incorrect offset calculation.Anton Mitrofanov2011-07-101-2/+5
| | | | | | | | | | | | | | | | ptrdiff_t can be 4 bytes, which leads to the next element being 4-byte aligned and thus at a different offset than intended. Forcing 8-byte alignment forces equal offset of dither16/32 on x86-32 and x86-64. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * matroskadec: fix stupid typo (!= -> ==)Anton Khirnov2011-07-101-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: remove duplicates from order-only directory prerequisite listDiego Biurrun2011-07-101-3/+3
| | | | | | | | | | This reduces startup latency for make invocations, which is especially noticeable on systems that are slow or have slow I/O, like Windows.
| * build: rework rules for things in the tools dirMans Rullgard2011-07-106-18/+19
| | | | | | | | | | | | | | | | Declaring tools associated with each library in their respective makefiles allows these tools to easily depend on the correct prerequisites and link against the libs they need. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * configure: fix --cpu=host with gcc 4.6Mans Rullgard2011-07-101-1/+1
| | | | | | | | | | | | | | The output from -v with gcc 4.6 has changed such that the search pattern matches too soon without making it more strict. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: use const macro to define constant data in asmMans Rullgard2011-07-106-25/+20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * bitdepth: simplify FUNC/FUNCC macrosMans Rullgard2011-07-101-10/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: remove ff_emulated_edge_mc macro used in one placeMans Rullgard2011-07-102-3/+1
| | | | | | | | | | | | | | | | | | | | This macro can cause problems in conjunction with the bitdepth template expansion. It was presumably added to keep source compatibility when high bitdepth support was added. However, emulated_edge_mc is a dsputil pointer and should not be called directly, so there is little reason to keep such a macro. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * 9/10-bit: simplify clipping macrosMans Rullgard2011-07-101-15/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * matroskadec: reindentAnton Khirnov2011-07-101-15/+15
| |
| * matroskadec: defer parsing of cues element until we seek.Aaron Colwell2011-07-101-45/+86
| | | | | | | | | | | | | | This decreases startup latency. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavc: add support for codec-specific defaults.Anton Khirnov2011-07-103-0/+23
| |
| * lavc: make avcodec_alloc_context3 officially public.Anton Khirnov2011-07-1011-17/+41
| | | | | | | | Deprecate avcodec_alloc_context/2.
| * lavc: remove a half-working attempt at different defaults for audio/video ↵Anton Khirnov2011-07-102-3/+3
| | | | | | | | | | | | codecs. It should be replaced with proper per-codec defaults.
| * ac3dec: add a drc_scale private optionAnton Khirnov2011-07-105-1/+28
| | | | | | | | | | | | Deprecate corresponding AVCodecContext option. This is the first test of decoder private options.
| * lavf: add avformat_find_stream_info()Anton Khirnov2011-07-103-6/+41
| | | | | | | | It supports passing options to codecs.
| * lavc: introduce avcodec_open2() as a replacement for avcodec_open().Anton Khirnov2011-07-107-5/+69
| | | | | | | | | | Adds support for decoder-private options and makes setting other options simpler.
* | Merge branch 'sws_32bit_integration'Michael Niedermayer2011-07-1113-422/+736
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sws_32bit_integration: regtests/sws: update checksums for recent changes sws: dont mess with XInc when the code needing it isnt used sws: Fix chroma init for 32bit buffers. swscale: error dithering for 16/9/10-bit to 8-bit. swscale: fix overflow in 16-bit vertical scaling. swscale: fix crash in 8-bpc bilinear output without alpha. swscale: fix 16-bit scaling when output is 8-bits. sws: fix non native endian 9-15 bit input with 16bit out sws: disable scale16 when int32 is used sws: fix rgb -> 16bit sws: fix uv overwrite in 32bt sws: fix gray16_1 sws:ix yuv2rgb48_1_c_template() sws: fix 16/32 bug from merge swscale: for >8bit scaling, read in native bit-depth. swscale: fix another yuv range conversion overflow in 16bit scaling. (cherry picked from commit 81cc7d0bd1eab0aa782ff8dd49e087025a42cdee) swscale: fix yuv range correction when using 16-bit scaling. (cherry picked from commit e0b8fff6c7a293e35079ba1931bd19372686b3f6) swscale: implement >8bit scaling support. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | regtests/sws: update checksums for recent changesMichael Niedermayer2011-07-118-68/+68
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * | sws: dont mess with XInc when the code needing it isnt usedMichael Niedermayer2011-07-111-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * | sws: Fix chroma init for 32bit buffers.Michael Niedermayer2011-07-111-2/+8
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * | swscale: error dithering for 16/9/10-bit to 8-bit.Ronald S. Bultje2011-07-113-49/+160
| | | | | | | | | | | | Based on a somewhat similar idea in FFmpeg's swscale copy.
| * | swscale: fix overflow in 16-bit vertical scaling.Ronald S. Bultje2011-07-111-9/+9
| | | | | | | | | | | | | | | | | | We operated on 31-bits, but with e.g. lanczos scaling, values can add up to beyond 0x80000000, thus leading to output of zeroes. Drop one bit of precision fixes this.
| * | swscale: fix crash in 8-bpc bilinear output without alpha.Ronald S. Bultje2011-07-111-1/+2
| | | | | | | | | | | | | | | | | | We accessed the alpha array even it wasn't used and didn't exist, hence leading to a NULL pointer segfault. (cherry picked from commit bf2cba453244a74331238a472fe0e309f116f4d9)
| * | swscale: fix 16-bit scaling when output is 8-bits.Ronald S. Bultje2011-07-112-13/+13
| | | | | | | | | | | | | | | We would use the second half of the U plane buffer, rather than the V plane buffer, to output the V plane pixels.
| * | sws: fix non native endian 9-15 bit input with 16bit outMichael Niedermayer2011-07-111-0/+4
| | |
| * | sws: disable scale16 when int32 is usedMichael Niedermayer2011-07-112-3/+6
| | |
| * | sws: fix rgb -> 16bitMichael Niedermayer2011-07-112-5/+8
| | |
| * | sws: fix uv overwrite in 32btMichael Niedermayer2011-07-111-3/+3
| | |
| * | sws: fix gray16_1Michael Niedermayer2011-07-111-2/+2
| | |
| * | sws:ix yuv2rgb48_1_c_template()Michael Niedermayer2011-07-111-2/+2
| | |
| * | sws: fix 16/32 bug from mergeMichael Niedermayer2011-07-111-11/+12
| | |
| * | swscale: for >8bit scaling, read in native bit-depth.Ronald S. Bultje2011-07-115-63/+11
| | | | | | | | | | | | | | | | | | For 9/10bit, it means we don't have to upscale to 16bit before actual scaling or pixel format conversion, and thus a performance gain.
| * | Merge branch 'ronalds_buggy_gt8bit_sws'Michael Niedermayer2011-07-115-288/+478
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ronalds_buggy_gt8bit_sws: swscale: fix another yuv range conversion overflow in 16bit scaling. (cherry picked from commit 81cc7d0bd1eab0aa782ff8dd49e087025a42cdee) swscale: fix yuv range correction when using 16-bit scaling. (cherry picked from commit e0b8fff6c7a293e35079ba1931bd19372686b3f6) swscale: implement >8bit scaling support. Conflicts: libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.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>
| | * | swscale: fix another yuv range conversion overflow in 16bit scaling.Ronald S. Bultje2011-07-011-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit 81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
| | * | swscale: fix yuv range correction when using 16-bit scaling.Ronald S. Bultje2011-07-011-6/+6
| | | | | | | | | | | | | | | | (cherry picked from commit e0b8fff6c7a293e35079ba1931bd19372686b3f6)
| | * | swscale: implement >8bit scaling support.Ronald S. Bultje2011-06-3012-373/+545
| | | | | | | | | | | | | | | | | | | | | | | | This means that precision is retained when scaling between sample formats with >8 bits per component (48bit RGB, 16bit grayscale, 9/10/16bit YUV).
* | | | Hint why SDL_Init() may have failed.Carl Eugen Hoyos2011-07-101-0/+1
| | | |
* | | | Match VA-API / VDPAU with zlib / bzlib build system documentation.Carl Eugen Hoyos2011-07-101-2/+2
| | | |
* | | | examples/muxing.c: remove doxy reference to unexisting fileStefano Sabatini2011-07-101-1/+0
| | | |
* | | | doc/examples: add decoding/filtering example programStefano Sabatini2011-07-102-1/+231
| | | |
* | | | examples/encoding.c: remove unnecessary includesStefano Sabatini2011-07-101-8/+0
| | | | | | | | | | | | | | | | Simplify.
* | | | examples/encoding.c: use av_image_alloc() for allocating an image bufferStefano Sabatini2011-07-101-10/+6
| | | | | | | | | | | | | | | | Simplify.
* | | | graphparser: simplify condition in avfilter_graph_parse()Stefano Sabatini2011-07-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since avfilter_graph_parse() creates the "[in]" inout for the first unlabelled input pad, it is expected that it will create an "[out]" inout for last unlabelled output pad, even in the case where it cannot find any open input pad with that name. This change removes the check on the existence of an open input pad named "out", so it simplifies the checked condition while implementing a more intuitive behavior.
* | | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-1019-108/+1191
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) H.264: fix filter_mb_fast with 4:4:4 + 8x8dct alsa: limit buffer_size to 32768 frames. alsa: fallback to buffer_size/4 for period_size. doc: replace @pxref by @ref where appropriate mpeg1video: don't abort if thread_count is too high. segafilm: add support for videos with cri adx adpcm gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps libxvid: Add const qualifier to silence compiler warning. H.264: improve qp_thresh check H.264: use fill_rectangle in CABAC decoding H.264: Remove redundant hl_motion_16/8 code H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP H.264: faster P-SKIP decoding H.264: av_always_inline some more functions H.264: Add x86 assembly for 10-bit H.264 predict functions swscale: rename uv_off/uv_off2 to uv_off_px/byte. swscale: implement error dithering in planarCopyWrapper. swscale: error dithering for 16/9/10-bit to 8-bit. swscale: fix overflow in 16-bit vertical scaling. swscale: fix crash in 8-bpc bilinear output without alpha. ... Conflicts: doc/developer.texi libavdevice/alsa-audio.h libavformat/gxf.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | H.264: fix filter_mb_fast with 4:4:4 + 8x8dctJason Garrett-Glaser2011-07-091-1/+1
| | | |
| * | | alsa: limit buffer_size to 32768 frames.Justin Ruggles2011-07-092-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | In testing, the file output plugin gave a max buffer size of about 20 million frames, which is way more than what is really needed and causes a memory allocation error on my system.
| * | | alsa: fallback to buffer_size/4 for period_size.Justin Ruggles2011-07-091-0/+2
| | | | | | | | | | | | | | | | | | | | buffer_size/4 is the value used by aplay. This fixes output to null devices, e.g. writing ALSA output to a file.
OpenPOWER on IntegriCloud