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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-21Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'Michael Niedermayer
* commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99': libavresample: Annotate AARCH64 init function with av_cold Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'Michael Niedermayer
* commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7': rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'Michael Niedermayer
* commit 'a335ed767161c6da2815371177cfd5e40f78e5b7': rtpdec_h264: Remove an unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20Merge commit '176903ce833ce7469f411640e9748a0d549b5285'Michael Niedermayer
* commit '176903ce833ce7469f411640e9748a0d549b5285': rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20Merge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'Michael Niedermayer
* commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4': rtpdec_h264: Make a parameter pointer const Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'Michael Niedermayer
* commit '7650caf013f45ebebf128855735a0c6350836ea4': rtpdec_h264: Use av_realloc instead of av_malloc+mempcy Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'Michael Niedermayer
* commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd': rtpdec_h264: Include the right header for AV_RB16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20Merge commit 'ba2e07909b848e583245856a59d0fe1dd08f917e'Michael Niedermayer
* commit 'ba2e07909b848e583245856a59d0fe1dd08f917e': rtpdec_vp8: Set the keyframe flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/omadec: Use 64bit for ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/vqf: Use 64bit for ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/wtvdec: Use 64bit for ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/mvdec: Use 64bit for ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/apngdec: Use 64bit for ret to avoid overflowMichael Niedermayer
Missed this hunk in first commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/gxf: Use 64bit for res to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/idcin: Use 64bit for ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/apngdec: Use 64bit ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/asfdec: Use 64bit ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20wtvdec: fix integer overflow resulting in errors with large filesRodger Combs
This fixes a regression in 9fbc613f0df1628e7e78bca791fa8833846f8210 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20libavresample: Annotate AARCH64 init function with av_coldPeter Meerwald
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_aMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20rtpdec_h264: Remove an unnecessary checkMartin Storsjö
If src_len is too small for nal_size, we already print a warning above, and the next step is to check the while loop condition anyway, so this one serves no purpose. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_aMartin Storsjö
Previously, errors were only logged but the code kept on trying, and never actually returning the error as a return value. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20rtpdec_h264: Make a parameter pointer constMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20rtpdec_h264: Use av_realloc instead of av_malloc+mempcyMartin Storsjö
This is similar to what was done for rtpdec_hevc in ced7238cd01. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20rtpdec_h264: Include the right header for AV_RB16Martin Storsjö
Including libavcodec/get_bits.h is superfluous for AV_RB16 - nothing in this file uses any actual bitstream reader. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20rtpdec_vp8: Set the keyframe flagMartin Storsjö
This allows the output to be used with stream copy, which discards packet from the start until the first keyframe. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20MAINTAINERS: Add Oleksij as maintainer for DSS*Michael Niedermayer
Also add a 2nd maintainer at the authors request (due to lack of time) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20hlsenc: remove the AVIOContext for the playlist from the muxer contextHendrik Leppkes
Its only used in one function, having it in the context serves no purpose. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/movenc: Move avid DNxHD padding to the correct spotKevin Wheatley
Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg, when outputting DNxHD due to the incorrect padding placement. Now we add the padding in the correct place Tidy up FATE changes due to padding changes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avcodec/dca: move remaining tables to dcadataMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avcodec/snowdec: Fix avmv_index incrementMichael Niedermayer
Fixes reading uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avfilter/vf_eq: Add process_command to eq.Arwa Arif
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculationMichael Niedermayer
Also check the combined_pitch for validity (which is needed to keep the behavior identical in the error case) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avcodec/dss_sp: de-obfuscate index inversionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside bracketsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/dss: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/dss: Check sscanf() return value in dss_read_metadata_date()Michael Niedermayer
Fixes writing uninitialized values into metadata without error in case parsing fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'Michael Niedermayer
* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c': fate: Add tests for DSS Conflicts: tests/fate/audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'Michael Niedermayer
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499': lavf: Add DSS demuxer Conflicts: libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'Michael Niedermayer
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b': lavc: Add DSS SP decoder Conflicts: libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'Michael Niedermayer
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23': qsv_api: fix building with libmfx disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'Michael Niedermayer
* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d': configure: add missing h264_qsv hwaccel deps Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'Michael Niedermayer
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6': lavc: add an Intel libmfx-based H.264 decoder Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'Michael Niedermayer
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49': h264_parser: export video format and dimensions Conflicts: libavcodec/h264_parser.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'Michael Niedermayer
* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a': pixfmt: add a pixel format for QSV hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19fate: Add tests for DSSVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
2015-02-19lavf: Add DSS demuxerOleksij Rempel
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-19lavc: Add DSS SP decoderOleksij Rempel
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-19qsv_api: fix building with libmfx disabledAnton Khirnov
2015-02-19configure: add missing h264_qsv hwaccel depsAnton Khirnov