summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'Michael Niedermayer2013-05-18
|\ | | | | | | | | | | | | * commit '4a4107b48944397c914aa39ee16a82fe44db8c4c': jpegls: factorize return paths Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpegls: factorize return pathsLuca Barbato2013-05-17
| |
* | Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'Michael Niedermayer2013-05-18
|\| | | | | | | | | | | | | | | * commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f': jpegls: return meaningful errors sparc: VIS mnemonics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpegls: return meaningful errorsLuca Barbato2013-05-17
| |
| * sparc: VIS mnemonicsMichael Kostylev2013-05-17
| | | | | | | | | | | | | | | | | | | | | | | | Currently, if VIS is enabled by configure, it will also be enabled at run-time regardless of its support in the hardware. Thus, masking VIS usage as it is done in vis.h by constructing binary instructions is pointless. Using normal VIS mnemonics in inline assembly allows to take advantage of automatic register allocation, gets rid of register variables, which are unsupported by suncc for SPARC, and improves code readability. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of ↵Michael Niedermayer2013-05-18
| | | | | | | | | | | | alpha input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: dont randomly skip packets for offseting the indexMichael Niedermayer2013-05-17
| | | | | | | | | | | | Fixes Ticket2490 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | md5: avoid unnecessary copying.Reimar Döffinger2013-05-17
| | | | | | | | | | | | | | | | | | Where necessary use memcpy instead. Thanks to Giorgio Vazzana [mywing81 gmail] for spotting this loop as the cause for the bad performance. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | id3v2enc: chapter supportPaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | libmodplug: fix sz typePaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | vc1dec: restructure interpmvp codeMichael Niedermayer2013-05-17
| | | | | | | | | | | | | | This fixes a valgrind warning about use of uninitialized stuff (no actual such use occurs though) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Adding support for encoding VP8 AlphaVignesh Venkatasubramanian2013-05-17
| | | | | | | | | | | | | | | | | | | | This patch adds support for encoding VP8 files with alpha. The alpha channel is encoded separately and the output is placed in AVPacket's side_data. The muxer then muxes it into the BlockAdditional element of the matroska container. More details on spec here: http://goo.gl/wCP1y Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vformat/matroskaenc: factorize alpha code in mkv_write_block()Michael Niedermayer2013-05-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Adding support for muxing VP8 Alpha filesVignesh Venkatasubramanian2013-05-17
| | | | | | | | | | | | | | | | | | This patch adds support for muxing VP8 Alpha Files. The Alpha channel data is placed in BlockAdditional element of the matroska container. More information & exact spec on how this is implemented can be found here: http://goo.gl/wCP1y Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/pad: switch to AV_OPT_TYPE_COLORPaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/drawtext: switch to AV_OPT_TYPE_COLORPaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/life: switch to AV_OPT_TYPE_COLORPaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/color: switch to AV_OPT_TYPE_COLORPaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavu/opt: add AV_OPT_TYPE_COLORPaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: allocate sufficiently large scratch buffer for interlaced vid Conflicts: libavcodec/mpegvideo.c See: 73db0bf1b06084022db5f42377b3b7960b3d3f5e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: allocate sufficiently large scratch buffer for interlaced vidJindrich Makovicka2013-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPV_decode_mb_internal needs 3 * 16 * linesize bytes of scratch buffer For interlaced content, linesize is multiplied by two after the allocation of the scratch buffer, and the dest_cr pointer ends past the buffer. This patch makes ff_mpv_frame_size_alloc allocate a total of (aligned line_size) * 2 * 16 * 3 bytes, which suffices even for the interlaced case. CC:libav-stable@libav.org Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | * commit 'db8e336e5fc18c41cb4e9bab1960349e9800d546': pthread: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: reindentAnton Khirnov2013-05-17
| |
* | Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | * commit '30e256430eb88c6d4c382581b89bca171d79fbc0': lavc/pthread: remove obsolete checks Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc/pthread: remove obsolete checksAnton Khirnov2013-05-17
| | | | | | | | | | | | Those were useful when avcodec_thread_init() was a public functions. It was deprecated and removed some time ago, so those checks are not needed anymore.
* | Merge commit '16a645adeb758207346a4bbf66766f02734c461e'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | * commit '16a645adeb758207346a4bbf66766f02734c461e': vf_pixdesctest: make config_props work properly when called multiple times. vf_hqdn3d: make config_props work properly when called multiple times. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_pixdesctest: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| |
| * vf_hqdn3d: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| | | | | | | | Do not leak all the temp buffers.
* | Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fb29588a27a711132106b924e27b53789a58dcb': vf_drawtext: don't leak the expressions. vf_crop: make config_props work properly when called multiple times. vf_setdar: make config_props work properly when called multiple times. Conflicts: libavfilter/vf_aspect.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: don't leak the expressions.Anton Khirnov2013-05-17
| |
| * vf_crop: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| | | | | | | | Do not leak the x/y expressions.
| * vf_setdar: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| | | | | | | | Do not overwrite the variable set through AVOptions.
* | Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c205f42c86ccefa093c59434669af34ad14a52b': vf_drawbox: make config_props work properly when called multiple times. vf_drawtext: do not reset the frame number in config_input. vf_fps: move initializing pts from config_props to init. Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawbox: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| | | | | | | | Do not overwrite the variables set through AVOptions.
| * vf_drawtext: do not reset the frame number in config_input.Anton Khirnov2013-05-17
| | | | | | | | | | Frame number should be incremented normally even if the link properties change.
| * vf_fps: move initializing pts from config_props to init.Anton Khirnov2013-05-17
| | | | | | | | It should not be reinitialized if the link properties change.
* | Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7': vf_frei0r: make config_props work properly when called multiple times. vf_gradfun: make config_props work properly when called multiple times. vf_lut: make config_props work properly when called multiple times. Conflicts: libavfilter/vf_lut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| | | | | | | | Do not leak the initialized filter instance.
| * vf_gradfun: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| |
| * vf_lut: make config_props work properly when called multiple times.Anton Khirnov2013-05-17
| | | | | | | | Do not leak the expressions.
* | Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9': Apple Intermediate Codec decoder movenc: Don't add base_data_offset in tfhd for PIFF files Conflicts: Changelog libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Apple Intermediate Codec decoderKostya Shishkov2013-05-17
| |
| * movenc: Don't add base_data_offset in tfhd for PIFF filesJeremy Hinegardner2013-05-17
| | | | | | | | | | | | | | | | | | | | | | According to the PIFF specification[1] the base_data_offset field MUST be omitteed. See section 5.2.17. Since the ISMV files created by libavformat state that they are 'piff' compatible via 'ftyp' box, this needs to be corrected. [1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | * commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f': vc1dec: Add support for interlaced B-frames Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Add support for interlaced B-framesSebastian Sandberg2013-05-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Turn off usage of base_data_offset in tfhd for PIFF filesJeremy Hinegardner2013-05-17
| | | | | | | | | | | | | | | | | | | | According to the PIFF specification[1] the base_data_offset field MUST be omitteed. See section 5.2.17. Since the ISMV files created by ffmpeg state that they are 'piff' compatible via 'ftyp' box, this needs to be corrected. [1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Autodetect VA-APICarl Eugen Hoyos2013-05-17
| | | | | | | | | | This fixes a regression (reproducible since 1.2) and restores the behaviour of 0.6, 0.7, 0.8, 0.9, 0.10, 0.11, 1.0 and 1.1.
* | lavfi/drawbox: restore verbal form for drawbox options descriptionsStefano Sabatini2013-05-17
| |
* | lavfi: factorize drawgrid and drawbox codeStefano Sabatini2013-05-17
| |
* | tools/ffhash: Use O_BINARY when availableJames Almer2013-05-17
| | | | | | | | | | | | | | This fixes reading files in Windows Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 01:57:57 +0000