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
2014-07-10Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'Michael Niedermayer
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6': adxdec: get rid of an avpriv function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/roqvideoenc: Print the correct max resolutionMichael Niedermayer
Thanks-to: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/roqvideoenc: More verbose warning about no power of 2 dimensionsMichael Niedermayer
Thanks-to: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/dvdsubenc: Add dvdsub workaround for some playersOliver Fromme
The issue affects dvdsub subtitles (a.k.a. VOBSUB). Some players -- in particular hardware players -- cut off the lowest row of pixels if the number of rows in the subtitle is odd. The patch below implements a work-around for that. If the number of rows is odd, it is simply rounded up to an even number, adding an invisible (i.e. fully transparent) row. The work-around can be enabled or disabled with a new option -even_rows_fix. The default is disabled, so there is no change of behaviour for users who don't care about it. The overhead for the fix is low, and in many cases even zero: For subtitles with an odd number of rows (i.e. in 50% of cases on average), the size increases by two bytes because a fully transparent row is encoded as 0x00 0x00. However, in the VOBSUB standard, all data packets are padded to 2KB anyway, so in most cases the additional bytes just use some part of the padding, so there is no overhead. Only in the rare case that the 2KB boundary is hit (0.1% chance), a full 2KB block is added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/pthread_frame: fix setting hwaccel with threads and get_format()Michael Niedermayer
Fixes assertion failure with vdpau and vlc Fixes Ticket3742 Tested-by: oromit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/mpegvideo: clip mv visualization arrows so that their direction is ↵Michael Niedermayer
maintained Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09adxdec: get rid of an avpriv functionAnton Khirnov
The only thing the demuxer needs is the sample rate to set the timebase, which can be simply read with AV_RB32.
2014-07-09lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov
2014-07-09Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.Carl Eugen Hoyos
2014-07-09Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.Carl Eugen Hoyos
2014-07-09avcodec/mpegvideo: flip motion vector visualization for backward motion vectorsMichael Niedermayer
Also support changing arrow head/tail shape Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09alpha/idctdsp: move idct init code out of dsputilJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/alpha/dsputil_alpha: fix buildMichael Niedermayer
Disable moved functions to prevent build/test failure, patch to update and re-enable them is welcome volunteer to maintain the alpha code is welcome too Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/proresenc_anatoliy: check against maximum dimensionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/roqvideoenc: check dimensions against maximumMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/roqvideoenc: fix infinite lambda increasing loopMichael Niedermayer
The threshold was choosen so that no further size decrease happened with larger lambda with the test video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'Michael Niedermayer
* commit '79fce1ec8abd017593c003917fc123f7119a78d6': arm: Avoid using the 'setend' instruction on ARMv7 and newer Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08arm: Avoid using the 'setend' instruction on ARMv7 and newerMartin Storsjö
This instruction is deprecated on ARMv8, and it is serializing on some ARMv7 cores as well [1]. [1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293 CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-08Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'Michael Niedermayer
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3': dsputil: Split off FDCT bits into their own context Conflicts: configure libavcodec/Makefile libavcodec/asvenc.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'Michael Niedermayer
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d': libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/vmdvideo: remove unneeded includeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07dsputil: Split off FDCT bits into their own contextDiego Biurrun
2014-07-07libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstreamOmer Osman
For implicit signaling cases (as possible for Spectral Band Replication and Parametric Stereo Tools), the decoder must decode the first frame to correctly identify the stream configuration (as called from avformat_find_stream_info). The mechanism for this is built-in and only requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec struct. Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de> Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-07Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'Michael Niedermayer
* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503': vmd: Split audio and video decoder Conflicts: libavcodec/vmdvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07vmd: Split audio and video decoderNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-07avcodec/cljrdec: remove unneeded includeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'Michael Niedermayer
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b': dsputil: Move draw_edges() to mpegvideoencdsp Conflicts: libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'Michael Niedermayer
* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d': dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc.asm libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'Michael Niedermayer
* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94': dsputil: Split off *_8x8basis to a separate context Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07avcodec/mpegvideo_enc: fix b frame strategy 2Michael Niedermayer
Fixes Ticket3757 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07avcodec/mpegvideo: small indent fix in vismv codeClément Bœsch
2014-07-07avcodec: make vismv option as flag typesClément Bœsch
This allows for example -vismv pf+bf+bb instead of -vismv 7.
2014-07-07avcodec/roqvideodec: set JPEG output color rangeEric Lasota
Signed-off-by: Eric Lasota <ejlasota@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'Michael Niedermayer
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192': dsicin: Split audio and video decoder Conflicts: libavcodec/Makefile libavcodec/dsicinvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07dsputil: Move draw_edges() to mpegvideoencdspDiego Biurrun
2014-07-07Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'Michael Niedermayer
* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58': bmv: Split audio and video decoder Conflicts: libavcodec/bmvvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07avcodec/roqvideo: use JPEG color rangeEric Lasota
Signed-off-by: ejlasota <ejlasota@gmail.com> Also update fate test checksums Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoencDiego Biurrun
2014-07-07dsputil: Split off *_8x8basis to a separate contextDiego Biurrun
2014-07-06x86/svq1enc: use unaligned mov on SSE2James Almer
Might fix fate failures on some systems Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-06dsicin: Split audio and video decoderNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-06Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'Michael Niedermayer
* commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3': paf: split audio and video decoder Conflicts: libavcodec/pafvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-06Merge commit '373a6dda5422186bc057297342a9e559a564595e'Michael Niedermayer
* commit '373a6dda5422186bc057297342a9e559a564595e': cljr: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/cljrdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-06bmv: Split audio and video decoderNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-06paf: split audio and video decoderNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-06cljr: split decoder and encoderNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-06avcodec/mjpegenc_common: Restore removed copyright statementsMichael Niedermayer
These where removed by libav while spliting the file in adcb8392c9b185fd8a91a95fa256d15ab1432a30 See: de6d9b6404bfd1c589799142da5a95428f146edd See: 723106b279d9d78f5966f32bedfa33b88a702f69 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>