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
2015-10-22Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'Hendrik Leppkes
* commit 'f0a106578d759de6183eea3c75f8373b6d3153c1': roqvideodec: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit 'ef3a3519c10620c4206738595bf03fc0bed71802'Hendrik Leppkes
* commit 'ef3a3519c10620c4206738595bf03fc0bed71802': rawdec: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba'Hendrik Leppkes
* commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba': rawenc: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'Hendrik Leppkes
* commit '3496cec43304ac040d6d05f9d500a6f93cc049e7': msrle: Use AVFrame instead of AVPicture Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit 'ac981d16415e7fd99683e10297781c7d9ec1a8cd'Hendrik Leppkes
* commit 'ac981d16415e7fd99683e10297781c7d9ec1a8cd': APIchanges: Fill in missing dates and hashes Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22ffmpeg: fix ffmpeg.h trailing whitespaceMarton Balint
How this passed through the commit hook? Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22qsvdec: fix get_format and hwaccel_context handlingHendrik Leppkes
This enables the qsv transcoder to actually get activated
2015-10-22Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'Hendrik Leppkes
* commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843': qsvenc: add an API for allocating opaque surfaces Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f'Hendrik Leppkes
* commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f': qsvenc: cosmetics, reindent Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42'Hendrik Leppkes
* commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42': qsvenc: set the timestamp for PIX_FMT_QSV frames as well Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22Merge commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79'Hendrik Leppkes
* commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79': qsvenc: support passing arbitrary external buffers to the encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22avutil/intmath: fix undefined behavior in ff_ctzll_c()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-22libavformat/electronicarts: also demux mpeg audio layer 2Peter Ross
Signed-off-by: Peter Ross <pross@xvid.org> http://wiki.multimedia.cx/index.php?title=Electronic_Arts_SCxl Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-22lavc/x86/vc1dsp_init: Fix compilation with --disable-yasm.Carl Eugen Hoyos
2015-10-22lavf/mpjpegdec: Return 0 if an allocation inside the probe function fails.Carl Eugen Hoyos
2015-10-22avformat/electronicarts: fix demuxing of certain eam filesPaul B Mahol
Such files have gaps between header chunks. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-10-22avformat/electronicarts: support ADPCM PSXPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-10-22mmaldec: Add mpeg2 decoding supportJulian Scheel
Register mmaldec as mpeg2 decoder. Supporting mpeg2 in mmaldec is just a matter of setting the correct MMAL_ENCODING on the input port. To ease the addition of further supported mmal codecs a macro is introduced to generate the decoder and decoder class structs. Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: wm4 <nfxjfg@googlemail.com>
2015-10-22x86/Makefile: move decoder/encoder objects out of the subsystems sectionJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2015-10-22ffmpeg: exit on corrupt packets or decoded frames if exit_on_error flag is ↵Marton Balint
present Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22ffmpeg: factorize checking decoder resultMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22ffmpeg: exit on av_write_trailer failure if exit_on_error is setMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22ffmpeg: log failed av_write_trailerMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22vc1dsp: Port ff_vc1_put_ver_16b_shift2_mmx to yasmTimothy Gu
This function is only used within other inline asm functions, hence the HAVE_MMX_INLINE guard. Per recent discussions, we should not worry about the performance of inline asm-only builds.
2015-10-22libavformat/mxfdec.c: Report dark metadata keys only when they match no ↵Alexis Ballier
parser at all, not everytime they fail to match one. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-22libavformat/mxfdec.c: cosmetics: Add missing space after '?' in log message.Alexis Ballier
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-22avcodec: rename avpriv_color_frame to ff_color_frameAndreas Cadhalpun
It is only used inside libavcodec. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-10-22avcodec: drop 2 suffix from avpriv_ac3_parse_header2Andreas Cadhalpun
avpriv_ac3_parse_header was removed in commit 3dfb643. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-10-21avfilter/vf_ssim: Add support for writing stats to stdoutTobias Rapp
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-21huffyuvencdsp: Cherry pick changes left out in the last commitTimothy Gu
Oops.
2015-10-21huffyuvencdsp: Add ff_diff_bytes_{sse2,avx2}Timothy Gu
SSE2 version 4%-35% faster than MMX depending on the width. AVX2 version 1%-13% faster than SSE2 depending on the width.
2015-10-21mmaldec: Fix avpriv_atomic_get usageJulian Scheel
There is no avpriv_atomic_get, instead avpriv_atomic_int_get is to be used for integers. This fixes building mmaldec. Signed-off-by: Julian Scheel <julian@jusst.de> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-21aacdec: fix strict prototype warningHendrik Leppkes
Function protoypes without arguments require a void argument in C, instead of an empty list.
2015-10-21roqvideodec: Replace avpicture functions with imgutilsVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-21rawdec: Replace avpicture functions with imgutilsLuca Barbato
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-21rawenc: Replace avpicture functions with imgutilsLuca Barbato
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-21msrle: Use AVFrame instead of AVPictureVittorio Giovara
Callers always use a frame and cast it to AVPicture, change ff_msrle_decode() to accept an AVFrame directly instead. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-21lavf: add oggparsedaala and bump microRostislav Pehlivanov
This commit introduces a parser for the current bitstream produced by Daala. It currently bears a large similarity with Theora, another codec produced by Xiph. While likely to change in the future, its basic format of packet parsing should remain fairly identical with its current structure. Once the bitstream freezes, there are a few probable simplifications that could be made. Also, the current version (major, minor and micro) is stuck at zero so it's unusable as a way to warn about possible incompatibilities. This will change once the bitstream freezes, however until then this file is strictly targeting the current git master of the reference encoder, libdaala. This file was developed independently at the same time by both myself and Vittorio Giovara, who used libav as a starting point. For fairness, and to prevent confusion and allegations, his name has been added to the copyright in the license header as well, and vice versa.
2015-10-21lavc: add AV_CODEC_ID_DAALA to the list of codec IDs and bump minorRostislav Pehlivanov
This commit shall introduce the first step of adding support for the Daala next generation video codec to FFmpeg. Although still in development, the codec is showing good progress and exchanging work through IETF drafts. The companies behind Daala are also participating in the Alliance for Open Media, so it's likely that whatever the result any of these collaborations produce it's probable that elements from Daala could be used in them, or perhaps this codec itself could be the result.
2015-10-21libvpxenc: remove some unused ctrl id mappingsJames Zern
VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed from libvpx and the remaining values were never used here Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Zern <jzern@google.com>
2015-10-21huffyuvencdsp: Convert ff_diff_bytes_mmx to yasmTimothy Gu
Heavily based upon ff_add_bytes by Christophe Gisquet. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2015-10-21avfilter/vf_psnr: Add support for writing stats to stdoutTobias Rapp
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-21avutil: merge avpriv_float_dsp_init into avpriv_float_dsp_allocAndreas Cadhalpun
Also replace the last two usages of avpriv_float_dsp_init with avpriv_float_dsp_alloc. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-10-21avcodec: remove unused avpriv_ac3_parse_headerAndreas Cadhalpun
It was replaced by avpriv_ac3_parse_header2. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-10-21avutil: install des.h, rc4.h and tree.h as public headersAndreas Cadhalpun
These headers contain functions supposed to be public. libavutil/des.h: av_des_alloc av_des_crypt av_des_init av_des_mac libavutil/rc4.h: av_rc4_alloc av_rc4_crypt av_rc4_init libavutil/tree.h av_tree_destroy av_tree_enumerate av_tree_find av_tree_insert av_tree_node_alloc av_tree_node_size Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-10-20dnxhdenc: Optimize get_pixels_8x4_sym for 10-bitTimothy Gu
This reverts commit 628e6d0164febc8e69b0f10dfa487e8a2dd1a28a and uses a better fix. Before: 4483 decicycles in get_pixels_8x4_sym, 131032 runs, 40 skips After: 2569 decicycles in get_pixels_8x4_sym, 131054 runs, 18 skips
2015-10-20dca_parser: don't overwrite the sample rate, it may not be correctHendrik Leppkes
The parser only reads the dca core sample rate, which is limited to a maximum of 48000 Hz, while X96 and HD extensions can increase the sample rate up to 192000 Hz. This change prevents the parser and decoder fighting over the sample rate, potentially confusing user applications. This also fixes sample rate display of >48000Hz files with ffmpeg/ffprobe when using libdcadec. Fixes ticket #4397
2015-10-20avformat/mp3dec: improve junk skipping heuristicwm4
Commit 2b3e9bbfb529e6bde238aeb511b55ebe461664c8 caused problems for a certain API user: https://code.google.com/p/chromium/issues/detail?id=537725 https://code.google.com/p/chromium/issues/detail?id=542032 The problem seems rather arbitrary, because if there's junk, anything can happen. In this case, the imperfect junk skipping just caused it to read different junk, from what I can see. We can improve the accuracy of junk detection by a lot by checking if 2 consecutive frames use the same configuration. While in theory it might be completely fine for the 1st frame to have a different format than the 2nd frame, it's exceedingly unlikely, and I can't think of a legitimate use-case. This is approximately the same mpg123 does for junk skipping. The set of compared header bits is the same as the libavcodec mp3 parser uses for similar purposes.